diff --git a/src/help.cpp b/src/help.cpp
index 860d5406..0539a769 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -259,7 +259,7 @@ void Help::GetKeybindings()
 	
 	*w << "\n\n   " << fmtBold << "Keys - Media library\n -----------------------------------------\n" << fmtBoldEnd;
 	if (!Config.media_library_disable_two_column_mode)
-		*w << DisplayKeys(Key.MediaLibrary)		<< "Switch between two/three columns\n";
+		*w << DisplayKeys(Key.MediaLibrary)	<< "Switch between two/three columns\n";
 	*w << DisplayKeys(&Key.VolumeDown[0], 1)	<< "Previous column\n";
 	*w << DisplayKeys(&Key.VolumeUp[0], 1)		<< "Next column\n";
 	*w << DisplayKeys(Key.Enter)			<< "Add to playlist and play song/album/artist's songs\n";
diff --git a/src/media_library.cpp b/src/media_library.cpp
index 4730bf84..c402763e 100644
--- a/src/media_library.cpp
+++ b/src/media_library.cpp
@@ -125,24 +125,29 @@ void MediaLibrary::Refresh()
 
 void MediaLibrary::SwitchTo()
 {
-	if (myScreen == this && !Config.media_library_disable_two_column_mode)
+	if (myScreen == this)
 	{
-		hasTwoColumns = !hasTwoColumns;
-		hasToBeResized = 1;
-		Artists->Clear();
-		Albums->Clear();
-		Albums->Reset();
-		Songs->Clear();
-		if (hasTwoColumns)
-		{
-			if (w == Artists)
-				NextColumn();
-			std::string item_type = IntoStr(Config.media_lib_primary_tag);
-			ToLower(item_type);
-			Albums->SetTitle("Albums (sorted by " + item_type + ")");
-		}
+		if (Config.media_library_disable_two_column_mode)
+			return;
 		else
-			Albums->SetTitle("Albums");
+		{
+			hasTwoColumns = !hasTwoColumns;
+			hasToBeResized = 1;
+			Artists->Clear();
+			Albums->Clear();
+			Albums->Reset();
+			Songs->Clear();
+			if (hasTwoColumns)
+			{
+				if (w == Artists)
+					NextColumn();
+				std::string item_type = IntoStr(Config.media_lib_primary_tag);
+				ToLower(item_type);
+				Albums->SetTitle("Albums (sorted by " + item_type + ")");
+			}
+			else
+				Albums->SetTitle("Albums");
+		}
 	}
 	
 	if (!isInitialized)