diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp
index 0c5987bb8..a661c3750 100644
--- a/src/libcalamaresui/ViewManager.cpp
+++ b/src/libcalamaresui/ViewManager.cpp
@@ -369,7 +369,7 @@ ViewManager::next()
             UPDATE_BUTTON_PROPERTY( backEnabled, false )
         }
         updateCancelEnabled( !settings->disableCancel() && !( executing && settings->disableCancelDuringExec() ) );
-        updateBackAndNextVisibility(!executing || !settings->hideBackAndNextDuringExec());
+        updateBackAndNextVisibility( !( executing && !settings->hideBackAndNextDuringExec() ) );
     }
     else
     {