diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 1ba7bd772..5cbcad53b 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -211,6 +211,13 @@ KeyboardPage::createJobs( const QString& xOrgConfFileName,
 }
 
 
+void
+KeyboardPage::onActivate()
+{
+    ui->listLayout->setFocus();
+}
+
+
 void
 KeyboardPage::finalize()
 {
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index e4ed5b715..fe5087502 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -51,6 +51,7 @@ public:
     QList< Calamares::job_ptr > createJobs( const QString& xOrgConfFileName,
                                             const QString& convertedKeymapPath );
 
+    void onActivate();
     void finalize();
 
 protected slots:
diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index d613171e3..a7a1196e0 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@@ -104,6 +104,13 @@ KeyboardViewStep::jobs() const
 }
 
 
+void
+KeyboardViewStep::onActivate()
+{
+    m_widget->onActivate();
+}
+
+
 void
 KeyboardViewStep::onLeave()
 {
diff --git a/src/modules/keyboard/KeyboardViewStep.h b/src/modules/keyboard/KeyboardViewStep.h
index d88343bda..2a79c495f 100644
--- a/src/modules/keyboard/KeyboardViewStep.h
+++ b/src/modules/keyboard/KeyboardViewStep.h
@@ -52,6 +52,7 @@ public:
 
     QList< Calamares::job_ptr > jobs() const override;
 
+    void onActivate() override;
     void onLeave() override;
 
     void setConfigurationMap( const QVariantMap& configurationMap ) override;