diff --git a/lib/pages/entity.page.dart b/lib/pages/entity.page.dart
index cd8acd9..85eb1fc 100644
--- a/lib/pages/entity.page.dart
+++ b/lib/pages/entity.page.dart
@@ -14,6 +14,7 @@ class _EntityViewPageState extends State<EntityViewPage> {
   StreamSubscription _stateSubscription;
   Entity entity;
   Entity forwardToMainPage;
+  bool _popScheduled = false;
 
   @override
   void initState() {
@@ -34,7 +35,10 @@ class _EntityViewPageState extends State<EntityViewPage> {
   Widget build(BuildContext context) {
     Widget body;
     if (MediaQuery.of(context).size.width >= Sizes.tabletMinWidth) {
-      _popAfterBuild();
+      if (!_popScheduled) {
+        _popScheduled = true;
+        _popAfterBuild();
+      }
       body = PageLoadingIndicator();
     } else {
       body = entity.buildEntityPageWidget(context);
diff --git a/pubspec.yaml b/pubspec.yaml
index e285b17..a80fe90 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: hass_client
 description: Home Assistant Android Client
 
-version: 0.6.6+660
+version: 0.6.6+662
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"