diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index de398d4abfd7782f8242acaba2428542de744dea..a8914b4dcf77af681282880d8f3967ed2ca9f34b 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -435,10 +435,10 @@ QString MainWindow::getWindowStateKey()
 {
     if (UASManager::instance()->getActiveUAS())
     {
-        return QString::number(currentView)+"_windowstate_" + UASManager::instance()->getActiveUAS()->getAutopilotTypeName();
+        return QString::number(currentView)+"_windowstate_" + QString::number(getCustomMode()) + "_" + UASManager::instance()->getActiveUAS()->getAutopilotTypeName();
     }
     else
-        return QString::number(currentView)+"_windowstate";
+        return QString::number(currentView)+"_windowstate_" + QString::number(getCustomMode());
 }
 
 QString MainWindow::getWindowGeometryKey()