diff --git a/lutris/gui/installerwindow.py b/lutris/gui/installerwindow.py
index caefc9a272..5d9dc7ad98 100644
--- a/lutris/gui/installerwindow.py
+++ b/lutris/gui/installerwindow.py
@@ -236,12 +236,12 @@ def on_installer_selected(self, _widget, installer_slug):
 
     def select_install_folder(self):
         """Stage where we select the install directory."""
-        if self.interpreter.installer.creates_game_folder:
-            self.set_message(_("Select installation directory"))
-            default_path = self.interpreter.get_default_target()
-            self.set_install_destination(default_path)
-        else:
-            self.set_message(_("Click install to continue"))
+        if not self.interpreter.installer.creates_game_folder:
+            self.on_install_clicked(self.install_button)
+            return
+        self.set_message(_("Select installation directory"))
+        default_path = self.interpreter.get_default_target()
+        self.set_install_destination(default_path)
         if self.continue_handler:
             self.continue_button.disconnect(self.continue_handler)
         self.continue_button.hide()
diff --git a/lutris/gui/widgets/installer.py b/lutris/gui/widgets/installer.py
index 7cc330892c..f0f225c01a 100644
--- a/lutris/gui/widgets/installer.py
+++ b/lutris/gui/widgets/installer.py
@@ -4,10 +4,10 @@
 
 from gi.repository import GObject, Gtk, Pango
 
+from lutris.cache import save_to_cache
 from lutris.gui.widgets.common import FileChooserEntry
 from lutris.gui.widgets.download_progress import DownloadProgressBox
 from lutris.installer.steam_installer import SteamInstaller
-from lutris.cache import save_to_cache
 from lutris.util import system
 from lutris.util.log import logger
 from lutris.util.strings import add_url_tags, gtk_safe