diff --git a/app/qml/main.qml b/app/qml/main.qml
index 4ec77b314..112aff44b 100644
--- a/app/qml/main.qml
+++ b/app/qml/main.qml
@@ -444,6 +444,9 @@ ApplicationWindow {
     Loader {
       id: gpsDataPageLoader
 
+      property string lastState
+      property string lastMapState
+
       asynchronous: true
       active: false
       focus: true
@@ -451,6 +454,8 @@ ApplicationWindow {
       onActiveChanged: {
         if ( gpsDataPageLoader.active )
         {
+          lastState = stateManager.state
+          lastMapState = map.state
           formsStackManager.closeDrawer();
 
           if ( stakeoutPanelLoader.active )
@@ -466,6 +471,8 @@ ApplicationWindow {
             // user closed GPS panel and we are in stakeout mode - reopen stakeout panel
             stakeoutPanelLoader.item.restore()
           }
+          stateManager.state = lastState
+          map.state = lastMapState
         }
       }
     }