diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 7fa08b5e372..02fa5d92bb8 100644
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -370,7 +370,7 @@ def buildMovieListEntry(self, serviceref, info, begin, data):
 					res.append(MultiContentEntryText(pos=(width-tn-r, 0), size=(tn, self.itemHeight), font=1, flags=RT_HALIGN_RIGHT|valign_center, text=_("Trash can")))
 					return res
 			if not config.movielist.show_underlines.value:
-				txt = txt.replace('_', ' ')
+				txt = txt.replace('_', ' ').strip()
 			res.append(MultiContentEntryPixmapAlphaTest(pos=(0,self.dirShift), size=(iconSize,iconSize), png=self.iconFolder))
 			res.append(MultiContentEntryText(pos=(x, 0), size=(width-x-tn-r, self.itemHeight), font = 0, flags = RT_HALIGN_LEFT|valign_center, text = txt))
 			res.append(MultiContentEntryText(pos=(width-tn-r, 0), size=(tn, self.itemHeight), font=1, flags=RT_HALIGN_RIGHT|valign_center, text=_("Directory")))
@@ -387,7 +387,7 @@ def buildMovieListEntry(self, serviceref, info, begin, data):
 			if config.movielist.show_underlines.value:
 				data.txt = info.getName(serviceref)
 			else:
-				data.txt = info.getName(serviceref).replace('_', ' ')
+				data.txt = info.getName(serviceref).replace('_', ' ').strip()
 			if config.movielist.hide_extensions.value:
 				fileName, fileExtension = os.path.splitext(data.txt)
 				if fileExtension in KNOWN_EXTENSIONS:
diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index bb3f8a892d8..dd28eb1acfe 100644
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -52,7 +52,7 @@
 config.movielist.hide_extensions = ConfigYesNo(default=False)
 config.movielist.stop_service = ConfigYesNo(default=True)
 config.movielist.add_bookmark = ConfigYesNo(default=True)
-config.movielist.show_underlines = ConfigYesNo(default=True)
+config.movielist.show_underlines = ConfigYesNo(default=False)
 
 userDefinedButtons = None
 last_selected_dest = []