diff --git a/src/QmlControls/QGCView.qml b/src/QmlControls/QGCView.qml
index 4c54ec9b1835f8e8b4c0a4502e3380b762158d43..0dd6ff6eb44baae61b15a04ddb18490e792b699e 100644
--- a/src/QmlControls/QGCView.qml
+++ b/src/QmlControls/QGCView.qml
@@ -123,6 +123,9 @@ FactPanel {
             return
         }
 
+        __rejectButton.enabled = true
+        __acceptButton.enabled = true
+
         __stopAllAnimations()
 
         __dialogCharWidth = charWidth
@@ -144,6 +147,9 @@ FactPanel {
             return
         }
 
+        __rejectButton.enabled = true
+        __acceptButton.enabled = true
+
         __stopAllAnimations()
 
         __dialogCharWidth = showDialogDefaultWidth
@@ -302,7 +308,10 @@ FactPanel {
                     anchors.right:  __acceptButton.visible ?  __acceptButton.left : parent.right
                     anchors.bottom: parent.bottom
 
-                    onClicked: __dialogComponentLoader.item.reject()
+                    onClicked: {
+                        enabled = false // prevent multiple clicks
+                        __dialogComponentLoader.item.reject()
+                    }
                 }
 
                 QGCButton {
@@ -311,6 +320,7 @@ FactPanel {
                     primary:        true
 
                     onClicked: {
+                        enabled = false // prevent multiple clicks
                        __dialogComponentLoader.item.accept()
                     }
                 }