diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 25cd7a366..7ca60be10 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -250,20 +250,6 @@ KeyboardPage::onActivate()
 }
 
 
-void
-KeyboardPage::finalize()
-{
-    Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
-    if ( !m_selectedLayout.isEmpty() )
-    {
-        gs->insert( "keyboardLayout", m_selectedLayout );
-        gs->insert( "keyboardVariant", m_selectedVariant );  //empty means default variant
-    }
-
-    //FIXME: also store keyboard model for something?
-}
-
-
 void
 KeyboardPage::updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant )
 {
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index 6c2f99b68..41b4b7903 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -40,7 +40,6 @@ public:
     createJobs( const QString& xOrgConfFileName, const QString& convertedKeymapPath, bool writeEtcDefaultKeyboard );
 
     void onActivate();
-    void finalize();
 
 protected slots:
     void onListLayoutCurrentItemChanged( const QModelIndex& current, const QModelIndex& previous );
diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index 5cb168dc5..a068b5a5d 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@@ -104,7 +104,7 @@ KeyboardViewStep::onActivate()
 void
 KeyboardViewStep::onLeave()
 {
-    m_widget->finalize();
+    m_config->finalize();
 }