diff --git a/src/js/controller/navigation.js b/src/js/controller/navigation.js
index e60bd4c..6fc2c35 100644
--- a/src/js/controller/navigation.js
+++ b/src/js/controller/navigation.js
@@ -72,8 +72,10 @@ define(function(require) {
             }
 
             // select inbox if not yet selected
-            $scope.openFolder($scope.account.folders[0]);
-            $scope.$apply();
+            if (!$scope.state.nav.currentFolder) {
+                $scope.openFolder($scope.account.folders[0]);
+                $scope.$apply();
+            }
         });
 
         //