diff --git a/src/AnalyzeView/LogDownloadPage.qml b/src/AnalyzeView/LogDownloadPage.qml
index a17d228ea267fc231a78baf73c3192a729032e90..2117e34fbd381ecfeb95300b5688440b0b19ad1c 100644
--- a/src/AnalyzeView/LogDownloadPage.qml
+++ b/src/AnalyzeView/LogDownloadPage.qml
@@ -176,6 +176,7 @@ AnalyzePage {
                             message:    qsTr("All log files will be erased permanently. Is this really what you want?")
                             function accept() {
                                 logController.eraseAll()
+                                hideDialog()
                             }
                         }
                     }
diff --git a/src/QmlControls/QGCViewDialogContainer.qml b/src/QmlControls/QGCViewDialogContainer.qml
index 10166b7683f022286dc74a2ce727715717defcfc..7eb43ae2059d86c6b687bfbf79c98a0434b27789 100644
--- a/src/QmlControls/QGCViewDialogContainer.qml
+++ b/src/QmlControls/QGCViewDialogContainer.qml
@@ -112,20 +112,14 @@ Item {
                 id:                 _rejectButton
                 anchors.right:      _acceptButton.visible ?  _acceptButton.left : parent.right
                 anchors.bottom:     parent.bottom
-                onClicked: {
-                    _dialogComponentLoader.item.reject()
-                    mainWindowDialog.close()
-                }
+                onClicked:          _dialogComponentLoader.item.reject()
             }
             QGCButton {
                 id:                 _acceptButton
                 anchors.right:      parent.right
                 anchors.bottom:     parent.bottom
                 primary:            true
-                onClicked: {
-                    _dialogComponentLoader.item.accept()
-                    mainWindowDialog.close()
-                }
+                onClicked:          _dialogComponentLoader.item.accept()
             }
         }
         Item {