diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 94e186db8..46340dd9e 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -172,6 +172,9 @@ Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
         }
     }
 
+    if(!setupGameData())
+        return FirstRunDialogResultFailure;
+
     return setup() ? FirstRunDialogResultContinue : FirstRunDialogResultFailure;
 }
 
@@ -344,6 +347,10 @@ bool Launcher::MainDialog::setupGameSettings()
         file.close();
     }
 
+    return true;
+}
+
+bool Launcher::MainDialog::setupGameData() {
     QStringList dataDirs;
 
     // Check if the paths actually contain data files
@@ -379,7 +386,6 @@ bool Launcher::MainDialog::setupGameSettings()
             }
         }
     }
-
     return true;
 }
 
diff --git a/apps/launcher/maindialog.hpp b/apps/launcher/maindialog.hpp
index 96b5c0b97..8d0d61b8f 100644
--- a/apps/launcher/maindialog.hpp
+++ b/apps/launcher/maindialog.hpp
@@ -72,6 +72,7 @@ namespace Launcher
         bool setupLauncherSettings();
         bool setupGameSettings();
         bool setupGraphicsSettings();
+        bool setupGameData();
 
         void setVersionLabel();