diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index 353dc7a6fdf44648d9732b0173c14990ba6768d8..b4ebdd5d37bdc1a58a911fb749e1492df71d9d2c 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -573,7 +573,8 @@ QGCView {
 
             /// Close all dialogs
             function closeAll() {
-                mainWindow.resetCustomDialog()
+                mainWindow.enableToolbar()
+                rootLoader.sourceComponent  = null
                 guidedActionConfirm.visible = false
                 guidedActionList.visible    = false
                 altitudeSlider.visible      = false
diff --git a/src/QtLocationPlugin/QMLControl/OfflineMap.qml b/src/QtLocationPlugin/QMLControl/OfflineMap.qml
index 97ba8e0a8f81500813a8cce293693685590ba73c..a5fd64caed7a1c6991ac95eb772d19546ad85afd 100644
--- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml
+++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml
@@ -958,7 +958,7 @@ QGCView {
                 visible:        !ScreenTools.isMobile
                 onClicked: {
                     QGroundControl.mapEngineManager.importAction = QGCMapEngineManager.ActionNone
-                    mainWindow.showCustomDialog(importDialog)
+                    rootLoader.sourceComponent = importDialog
                 }
             }
             QGCButton {
@@ -1032,7 +1032,7 @@ QGCView {
                 onClicked: {
                     showList();
                     if(QGroundControl.mapEngineManager.exportSets()) {
-                        mainWindow.showCustomDialog(exportToDiskProgress)
+                        rootLoader.sourceComponent = exportToDiskProgress
                     }
                 }
             }
@@ -1090,7 +1090,8 @@ QGCView {
                         visible:        !QGroundControl.mapEngineManager.exporting
                         anchors.horizontalCenter: parent.horizontalCenter
                         onClicked: {
-                            mainWindow.closeCustomDialog()
+                            mainWindow.enableToolbar()
+                            rootLoader.sourceComponent = null
                         }
                     }
                 }
@@ -1173,7 +1174,8 @@ QGCView {
                         anchors.horizontalCenter: parent.horizontalCenter
                         onClicked: {
                             showList();
-                            mainWindow.closeCustomDialog()
+                            mainWindow.enableToolbar()
+                            rootLoader.sourceComponent = null
                         }
                     }
                     Row {
@@ -1186,7 +1188,8 @@ QGCView {
                             onClicked: {
                                 if(!QGroundControl.mapEngineManager.importSets()) {
                                     showList();
-                                    mainWindow.closeCustomDialog()
+                                    mainWindow.enableToolbar()
+                                    rootLoader.sourceComponent = null
                                 }
                             }
                         }
@@ -1195,7 +1198,8 @@ QGCView {
                             width:          _bigButtonSize * 1.25
                             onClicked: {
                                 showList();
-                                mainWindow.closeCustomDialog()
+                                mainWindow.enableToolbar()
+                                rootLoader.sourceComponent = null
                             }
                         }
                     }
diff --git a/src/ui/MainWindowInner.qml b/src/ui/MainWindowInner.qml
index 31936d81b43a80a9f3806f2536650dc41e8d3f35..69a12b94e40f1c61c55f6589f6672d1879a90352 100644
--- a/src/ui/MainWindowInner.qml
+++ b/src/ui/MainWindowInner.qml
@@ -63,7 +63,8 @@ Item {
     }
 
     function showSettingsView() {
-        resetCustomDialog()
+        mainWindow.enableToolbar()
+        rootLoader.sourceComponent = null
         if(currentPopUp) {
             currentPopUp.close()
         }
@@ -78,7 +79,8 @@ Item {
     }
 
     function showSetupView() {
-        resetCustomDialog()
+        mainWindow.enableToolbar()
+        rootLoader.sourceComponent = null
         if(currentPopUp) {
             currentPopUp.close()
         }
@@ -93,7 +95,8 @@ Item {
     }
 
     function showPlanView() {
-        resetCustomDialog()
+        mainWindow.enableToolbar()
+        rootLoader.sourceComponent = null
         if(currentPopUp) {
             currentPopUp.close()
         }
@@ -107,7 +110,8 @@ Item {
     }
 
     function showFlyView() {
-        resetCustomDialog()
+        mainWindow.enableToolbar()
+        rootLoader.sourceComponent = null
         if(currentPopUp) {
             currentPopUp.close()
         }
@@ -118,7 +122,8 @@ Item {
     }
 
     function showAnalyzeView() {
-        resetCustomDialog()
+        mainWindow.enableToolbar()
+        rootLoader.sourceComponent = null
         if(currentPopUp) {
             currentPopUp.close()
         }
@@ -148,20 +153,6 @@ Item {
         }
     }
 
-    function showCustomDialog(dlg) {
-        rootLoader.sourceComponent = dlg
-    }
-
-    function closeCustomDialog() {
-        mainWindow.enableToolbar()
-        rootLoader.sourceComponent = null
-    }
-
-    function resetCustomDialog() {
-        rootLoader.sourceComponent = null
-        mainWindow.enableToolbar()
-    }
-
     MessageDialog {
         id:                 unsavedMissionCloseDialog
         title:              qsTr("%1 close").arg(QGroundControl.appName)
@@ -237,7 +228,8 @@ Item {
     }
 
     function showMessageArea() {
-        mainWindow.resetCustomDialog()
+        mainWindow.enableToolbar()
+        rootLoader.sourceComponent = null
         var currentlyVisible = messageArea.visible
         if(currentPopUp) {
             currentPopUp.close()
@@ -258,7 +250,8 @@ Item {
     }
 
     function showPopUp(dropItem, centerX) {
-        mainWindow.resetCustomDialog()
+        mainWindow.enableToolbar()
+        rootLoader.sourceComponent = null
         var oldIndicator = indicatorDropdown.sourceComponent
         if(currentPopUp) {
             currentPopUp.close()