diff --git a/src/menu.h b/src/menu.h
index 204382ba..5bb31b9a 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -394,6 +394,12 @@ template <typename T> void NCurses::Menu<T>::Refresh()
 		if (!(*itsOptionsPtr)[itsHighlight]) // if it's still on separator, move in other direction.
 			Scroll(wDown);
 	}
+	else if ((*itsOptionsPtr)[itsHighlight]->isStatic) // static option can't be chosen
+	{
+		Scroll(wUp);
+		if ((*itsOptionsPtr)[itsHighlight]->isStatic) // if it's still chosen, scroll in other direction
+			Scroll(wDown);
+	}
 	size_t line = 0;
 	for (size_t i = itsBeginning; i < itsBeginning+itsHeight; ++i)
 	{
diff --git a/src/misc.cpp b/src/misc.cpp
index 3a733d72..753b0531 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -80,7 +80,7 @@ void SelectedItemsAdder::SwitchTo()
 	
 	w->Clear();
 	w->Reset();
-	w->AddOption("Current MPD playlist");
+	w->AddOption("Current MPD playlist", 0, myOldScreen == myPlaylist);
 	w->AddOption("Create new playlist", 0, playlists_not_active);
 	w->AddSeparator();