diff --git a/qml/DiscoverOctoPrintAction.qml b/qml/DiscoverOctoPrintAction.qml
index aa5216c..7c44a89 100644
--- a/qml/DiscoverOctoPrintAction.qml
+++ b/qml/DiscoverOctoPrintAction.qml
@@ -441,7 +441,7 @@ Cura.MachineAction
                         id: autoSelectCheckBox
                         text: catalog.i18nc("@label", "Select print job after uploading")
                         enabled: manager.instanceApiKeyAccepted && !autoPrintCheckBox.checked
-                        checked: Cura.ContainerManager.getContainerMetaDataEntry(activeMachineId, "octoprint_auto_select") == "true"
+                        checked: Cura.ContainerManager.getContainerMetaDataEntry(activeMachineId, "octoprint_auto_select") == "true" || (!enabled && autoPrintCheckBox.checked)
                         onClicked:
                         {
                             manager.setContainerMetaDataEntry(activeMachineId, "octoprint_auto_select", String(checked))
@@ -456,7 +456,7 @@ Cura.MachineAction
                             id: autoPowerControlCheckBox
                             text: catalog.i18nc("@label", "Turn on printer with")
                             visible: autoPowerControlPlugs.visible
-                            enabled: autoPrintCheckBox.checked
+                            enabled: autoPrintCheckBox.checked || autoSelectCheckBox.checked
                             anchors.verticalCenter: autoPowerControlPlugs.verticalCenter
                             checked: manager.instanceApiKeyAccepted && Cura.ContainerManager.getContainerMetaDataEntry(activeMachineId, "octoprint_power_control") == "true"
                             onClicked:
diff --git a/qml_qt5/DiscoverOctoPrintAction.qml b/qml_qt5/DiscoverOctoPrintAction.qml
index 309fe19..a75b25a 100644
--- a/qml_qt5/DiscoverOctoPrintAction.qml
+++ b/qml_qt5/DiscoverOctoPrintAction.qml
@@ -455,7 +455,7 @@ Cura.MachineAction
                         id: autoSelectCheckBox
                         text: catalog.i18nc("@label", "Select print job after uploading")
                         enabled: manager.instanceApiKeyAccepted && !autoPrintCheckBox.checked
-                        checked: Cura.ContainerManager.getContainerMetaDataEntry(activeMachineId, "octoprint_auto_select") == "true"
+                        checked: Cura.ContainerManager.getContainerMetaDataEntry(activeMachineId, "octoprint_auto_select") == "true" || (!enabled && autoPrintCheckBox.checked)
                         onClicked:
                         {
                             manager.setContainerMetaDataEntry(activeMachineId, "octoprint_auto_select", String(checked))
@@ -470,7 +470,7 @@ Cura.MachineAction
                             id: autoPowerControlCheckBox
                             text: catalog.i18nc("@label", "Turn on printer with")
                             visible: autoPowerControlPlugs.visible
-                            enabled: autoPrintCheckBox.checked
+                            enabled: autoPrintCheckBox.checked || autoSelectCheckBox.checked
                             anchors.verticalCenter: autoPowerControlPlugs.verticalCenter
                             checked: manager.instanceApiKeyAccepted && Cura.ContainerManager.getContainerMetaDataEntry(activeMachineId, "octoprint_power_control") == "true"
                             onClicked: