diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.py b/plugins/MachineSettingsAction/MachineSettingsAction.py
index 6e37ae9ae0..0bdf0006ed 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.py
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.py
@@ -34,6 +34,8 @@ class MachineSettingsAction(MachineAction):
         Application.getInstance().globalContainerStackChanged.connect(self._onGlobalContainerChanged)
         ExtruderManager.getInstance().activeExtruderChanged.connect(self._onActiveExtruderStackChanged)
 
+        self._backend = Application.getInstance().getBackend()
+
     def _reset(self):
         global_container_stack = Application.getInstance().getGlobalContainerStack()
         if not global_container_stack:
@@ -50,6 +52,15 @@ class MachineSettingsAction(MachineAction):
             self._container_index = container_index
             self.containerIndexChanged.emit()
 
+        # Disable autoslicing while the machineaction is showing
+        self._backend.disableTimer()
+
+    @pyqtSlot()
+    def onFinishAction(self):
+        # Restore autoslicing when the machineaction is dismissed
+        if self._backend.determineAutoSlicing():
+            self._backend.tickle()
+
     def _onActiveExtruderStackChanged(self):
         global_container_stack = Application.getInstance().getGlobalContainerStack()
         extruder_container_stack = ExtruderManager.getInstance().getActiveExtruderStack()
diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml
index 314265e1c1..626f62dbd9 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml
@@ -32,6 +32,18 @@ Cura.MachineAction
         onTriggered: base.extruderTabsCount = (machineExtruderCountProvider.properties.value > 1) ? parseInt(machineExtruderCountProvider.properties.value) : 0
     }
 
+    Connections
+    {
+        target: dialog ? dialog : null
+        ignoreUnknownSignals: true
+        // Any which way this action dialog is dismissed, make sure it is properly finished
+        onNextClicked: manager.onFinishAction()
+        onBackClicked: manager.onFinishAction()
+        onAccepted: manager.onFinishAction()
+        onRejected: manager.onFinishAction()
+        onClosing: manager.onFinishAction()
+    }
+
     anchors.fill: parent;
     Item
     {