diff --git a/MiSTer.ini b/MiSTer.ini
index 3b0ba2c..d862230 100644
--- a/MiSTer.ini
+++ b/MiSTer.ini
@@ -107,3 +107,6 @@ jammasd_pid=0xF3AD
 ; 0 - (default) - faster move in non-sniper mode, slower move in sniper mode.
 ; 1 - movement speeds are swapped.
 sniper_mode=0
+
+; Uncomment following option if you don't want to see a second line for long file names in listing.
+;browse_expand=0
diff --git a/menu.cpp b/menu.cpp
index 150bfbe..4e7a999 100644
--- a/menu.cpp
+++ b/menu.cpp
@@ -5278,7 +5278,9 @@ void PrintDirectory(int expand)
 	char s[40];
 	ScrollReset();
 
-	if (expand && cfg.browse_expand)
+	if (!cfg.browse_expand) expand = 0;
+
+	if (expand)
 	{
 		int k = flist_iFirstEntry() + OsdGetSize() - 1;
 		if (flist_nDirEntries() && k == flist_iSelectedEntry() && k <= flist_nDirEntries() &&