diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp
index f9a7c9e06..e587deed9 100644
--- a/src/libcalamaresui/ViewManager.cpp
+++ b/src/libcalamaresui/ViewManager.cpp
@@ -1,5 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
+ *   Copyright 2019, Dominic Hayes <ferenosdev@outlook.com>
+ *   Copyright 2019, abucodonosor
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
  *   Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
  *
@@ -281,6 +283,8 @@ ViewManager::next()
         {
             m_back->setEnabled( false );
             m_next->setEnabled( false );
+            if (Calamares::Settings::instance()->dontCancel())
+                m_quit->setEnabled( false );
         }
     }
     else