diff --git a/es-app/src/main.cpp b/es-app/src/main.cpp
index e420b42be..0651a53c8 100644
--- a/es-app/src/main.cpp
+++ b/es-app/src/main.cpp
@@ -540,7 +540,7 @@ int main(int argc, char* argv[])
     // Open the input configuration GUI if the flag to force this was passed from the command line.
     if (!loadSystemsStatus) {
         if (forceInputConfig) {
-            window.pushGui(new GuiDetectDevice(&window, true, true, [] {
+            window.pushGui(new GuiDetectDevice(&window, false, true, [] {
                 ViewController::get()->goToStart(); }));
         }
         else {
diff --git a/es-core/src/guis/GuiDetectDevice.cpp b/es-core/src/guis/GuiDetectDevice.cpp
index 9b60b8a14..f9135f672 100644
--- a/es-core/src/guis/GuiDetectDevice.cpp
+++ b/es-core/src/guis/GuiDetectDevice.cpp
@@ -36,8 +36,8 @@ GuiDetectDevice::GuiDetectDevice(
     addChild(&mGrid);
 
     // Title.
-    mTitle = std::make_shared<TextComponent>(mWindow, firstRun ? "WELCOME" : "CONFIGURE INPUT",
-        Font::get(FONT_SIZE_LARGE), 0x555555FF, ALIGN_CENTER);
+    mTitle = std::make_shared<TextComponent>(mWindow, firstRun ? "WELCOME" :
+        "CONFIGURE INPUT DEVICE", Font::get(FONT_SIZE_LARGE), 0x555555FF, ALIGN_CENTER);
     mGrid.setEntry(mTitle, Vector2i(0, 0), false, true, Vector2i(1, 1), GridFlags::BORDER_BOTTOM);
 
     // Device info.