diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp
index 700678d60ad84fe3007c572907074dc77c4c6bf6..ebce744458a1789c7d4f2b6780e27f085eba5962 100644
--- a/src/modules/locale/LocaleViewStep.cpp
+++ b/src/modules/locale/LocaleViewStep.cpp
@@ -31,6 +31,7 @@ LocaleViewStep::LocaleViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_widget( new QWidget() )
     , m_actualWidget( new LocalePage() )
+    , m_nextEnabled( false )
 {
     QBoxLayout* mainLayout = new QHBoxLayout;
     m_widget->setLayout( mainLayout );
@@ -47,12 +48,14 @@ LocaleViewStep::LocaleViewStep( QObject* parent )
         m_widget->layout()->removeWidget( waitingLabel );
         waitingLabel->deleteLater();
         m_widget->layout()->addWidget( m_actualWidget );
+        m_nextEnabled = true;
+        emit nextStatusChanged( m_nextEnabled );
     });
 
     QFuture< void > initFuture = QtConcurrent::run( LocaleGlobal::init );
     m_initWatcher.setFuture( initFuture );
 
-    emit nextStatusChanged( true );
+    emit nextStatusChanged( m_nextEnabled );
 }
 
 
@@ -93,7 +96,7 @@ LocaleViewStep::back()
 bool
 LocaleViewStep::isNextEnabled() const
 {
-    return true;
+    return m_nextEnabled;
 }
 
 
diff --git a/src/modules/locale/LocaleViewStep.h b/src/modules/locale/LocaleViewStep.h
index 0c9c97e335d6af497580893970cc1eb016e8daf7..02d7cf7a7c922cb5fb0912ba131f1532a27225fd 100644
--- a/src/modules/locale/LocaleViewStep.h
+++ b/src/modules/locale/LocaleViewStep.h
@@ -56,6 +56,7 @@ private:
     QFutureWatcher< void > m_initWatcher;
 
     LocalePage* m_actualWidget;
+    bool m_nextEnabled;
 };
 
 #endif // LOCALEVIEWSTEP_H