Index: sources/gui/qml/pages/settings/SettingsDecommission.qml
===================================================================
diff -u -ra7c580f0998ee781c47314384f677249cea4c4b4 -r515f8043640191643aee2cdc501990debcd953ef
--- sources/gui/qml/pages/settings/SettingsDecommission.qml	(.../SettingsDecommission.qml)	(revision a7c580f0998ee781c47314384f677249cea4c4b4)
+++ sources/gui/qml/pages/settings/SettingsDecommission.qml	(.../SettingsDecommission.qml)	(revision 515f8043640191643aee2cdc501990debcd953ef)
@@ -43,7 +43,9 @@
     }
     Connections { target: _confirmDialog
         function onAccepted() {
-            vDevice.decommission = "" // Need to set to something (ie: emtpy string) to trigger CPP code
+            if ( _confirmDialog.titleText == _root.title ) { // use the title as the indication of what has been confirmed and if that is related to this function.
+                vDevice.decommission = "" // Need to set to something (ie: emtpy string) to trigger CPP code
+            }
         }
     }
 }