diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.cpp b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
index 62063b187..e8ae630e7 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.cpp
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
@@ -21,11 +21,9 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( KeyboardQmlViewStepFactory, registerPlugin<
 KeyboardQmlViewStep::KeyboardQmlViewStep( QObject* parent )
     : Calamares::QmlViewStep( parent )
     , m_config( new Config( this ) )
-    , m_nextEnabled( false )
 {
     m_config->detectCurrentKeyboardLayout();
-    m_nextEnabled = true;
-    emit nextStatusChanged( m_nextEnabled );
+    emit nextStatusChanged( true );
 }
 
 QString
@@ -43,7 +41,7 @@ KeyboardQmlViewStep::prettyStatus() const
 bool
 KeyboardQmlViewStep::isNextEnabled() const
 {
-    return m_nextEnabled;
+    return true;
 }
 
 bool
diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.h b/src/modules/keyboardq/KeyboardQmlViewStep.h
index 2b9f98e27..eb31c3d59 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.h
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.h
@@ -45,7 +45,6 @@ public:
 
 private:
     Config* m_config;
-    bool m_nextEnabled;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( KeyboardQmlViewStepFactory )