diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp
index f159a12ff253..4bf23b897434 100644
--- a/gui/saveload-dialog.cpp
+++ b/gui/saveload-dialog.cpp
@@ -474,14 +474,14 @@ void SaveLoadChooserSimple::reflowLayout() {
int thumbY = y + kLineHeight;
int textLines = 0;
- if (!_saveDateSupport)
+ if (_saveDateSupport)
textLines += 2;
- if (!_playTimeSupport)
+ if (_playTimeSupport)
textLines++;
- if (_saveDateSupport || _playTimeSupport)
- textLines--; // add a line of padding at the bottom
+ if (textLines > 0)
+ textLines++; // add a line of padding at the bottom
- _container->resize(x, y, w, h - (kLineHeight * textLines));
+ _container->resize(x, y, w, h + (kLineHeight * textLines));
_gfxWidget->resize(thumbX, thumbY, thumbW, thumbH);
int height = thumbY + thumbH + kLineHeight;
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index e68ebc05306d..23488a8cd091 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1829,7 +1829,7 @@ const char *defaultXML1 = ""
""
""
""
""
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index bff0388d3e81..acb6d20a990b 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 9d9fe28a168f..2bb07d914c5b 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -1285,7 +1285,7 @@
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 983f727f6a04..055c82ad3ce2 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 25a95845aa96..0a1c377aea3b 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -1299,7 +1299,7 @@