diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index c1adc307b67..ce44341e140 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -631,15 +631,18 @@ void LauncherDialog::addGame() {
 		if (alert.runModal() == GUI::kMessageOK && _browser->runModal() > 0) {
 			MassAddDialog massAddDlg(_browser->getResult());
 
+			// Save current game position, so on cancel cursor will move back
 			ConfMan.set("temp_selection", _domains[_list->getSelected()], ConfigManager::kApplicationDomain);
 
 			massAddDlg.runModal();
 
+			// Update the ListWidget and force a redraw
+			updateListing();
+
+			// Set cursor to first detected game
 			selectGame(ConfMan.get("temp_selection", ConfigManager::kApplicationDomain));
 			ConfMan.removeKey("temp_selection", ConfigManager::kApplicationDomain);
 
-			// Update the ListWidget and force a redraw
-			updateListing();
 			draw();
 		}
 
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 297371463ee..564b3b6ba3f 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -976,7 +976,10 @@
 "width='250' "
 "height='Globals.Line.Height' "
 "/> "
-"<space size='32' /> "
+"<widget name='GameList' "
+"width='480' "
+"height='250' "
+"/> "
 "<layout type='horizontal' padding='8,8,8,8'> "
 "<widget name='Ok' "
 "type='Button' "
@@ -1634,7 +1637,10 @@
 "width='240' "
 "height='Globals.Line.Height' "
 "/> "
-"<space size='16' /> "
+"<widget name='GameList' "
+"width='280' "
+"height='100' "
+"/> "
 "<layout type='horizontal' padding='4,4,4,4'> "
 "<widget name='Ok' "
 "type='Button' "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 2d8034af004..7b87f0e46e3 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index c9ba986fc82..f8e804916a3 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -706,7 +706,10 @@
 					width = '250'
 					height = 'Globals.Line.Height'
 			/>
-			<space size = '32' />
+			<widget name = 'GameList'
+					width = '480'
+					height = '250'
+			/>
 			<layout type = 'horizontal' padding = '8, 8, 8, 8'>
 				<widget name = 'Ok'
 						type = 'Button'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 184f49689aa..007450e07b3 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -700,7 +700,10 @@
 					width = '240'
 					height = 'Globals.Line.Height'
 			/>
-			<space size = '16' />
+			<widget name = 'GameList'
+					width = '280'
+					height = '100'
+			/>
 			<layout type = 'horizontal' padding = '4, 4, 4, 4'>
 				<widget name = 'Ok'
 						type = 'Button'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 845d2aa1b9c..8d3d4a979e0 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index c59000e0993..2bebe18e534 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -691,7 +691,10 @@
 					width = '240'
 					height = 'Globals.Line.Height'
 			/>
-			<space size = '16' />
+			<widget name = 'GameList'
+					width = '280'
+					height = '100'
+			/>
 			<layout type = 'horizontal' padding = '4, 4, 4, 4'>
 				<widget name = 'Ok'
 						type = 'Button'