diff --git a/resources/qml/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/DiscardOrKeepProfileChangesDialog.qml
index 4c88801bb0..ed720adafa 100644
--- a/resources/qml/DiscardOrKeepProfileChangesDialog.qml
+++ b/resources/qml/DiscardOrKeepProfileChangesDialog.qml
@@ -146,7 +146,25 @@ UM.Dialog
                 ]
                 width: 300
                 currentIndex: UM.Preferences.getValue("cura/choice_on_profile_override")
-                onCurrentIndexChanged: UM.Preferences.setValue("cura/choice_on_profile_override", currentIndex)
+                onCurrentIndexChanged:
+                {
+                    UM.Preferences.setValue("cura/choice_on_profile_override", currentIndex)
+                    if (currentIndex == 1) {
+                        // 1 == "Discard and never ask again", so only enable the "Discard" button
+                        discardButton.enabled = true
+                        keepButton.enabled = false
+                    }
+                    else if (currentIndex == 2) {
+                        // 2 == "Keep and never ask again", so only enable the "Keep" button
+                        keepButton.enabled = true
+                        discardButton.enabled = false
+                    }
+                    else {
+                        // 0 == "Always ask me this", so show both
+                        keepButton.enabled = true
+                        discardButton.enabled = true
+                    }
+                }
             }
         }