diff --git a/mythplugins/mythmusic/mythmusic/lyricsview.cpp b/mythplugins/mythmusic/mythmusic/lyricsview.cpp
index 8d62fc2..b4a821b 100644
--- a/mythplugins/mythmusic/mythmusic/lyricsview.cpp
+++ b/mythplugins/mythmusic/mythmusic/lyricsview.cpp
@@ -231,21 +231,24 @@ void LyricsView::ShowMenu(void)
 
     MythMenu *menu = new MythMenu(label, this, "actionmenu");
 
-    menu->AddItem(tr("Find Lyrics"), NULL, createFindLyricsMenu());
-
-    if (gPlayer->getPlayMode() != MusicPlayer::PLAYMODE_RADIO)
+    if (m_lyricData)
     {
-        if (m_lyricData->lyrics()->count())
-            menu->AddItem(tr("Edit Lyrics"), NULL, NULL);
-        else
-            menu->AddItem(tr("Add Lyrics"), NULL, NULL);
+        menu->AddItem(tr("Find Lyrics"), NULL, createFindLyricsMenu());
 
-        if (m_lyricData->lyrics()->count() && m_lyricData->changed())
-            menu->AddItem(tr("Save Lyrics"), NULL, NULL);
-    }
+        if (gPlayer->getPlayMode() != MusicPlayer::PLAYMODE_RADIO)
+        {
+            if (m_lyricData->lyrics()->count())
+                menu->AddItem(tr("Edit Lyrics"), NULL, NULL);
+            else
+                menu->AddItem(tr("Add Lyrics"), NULL, NULL);
+
+            if (m_lyricData->lyrics()->count() && m_lyricData->changed())
+                menu->AddItem(tr("Save Lyrics"), NULL, NULL);
+        }
 
-    if (!m_autoScroll)
-        menu->AddItem(tr("Auto Scroll Lyrics"), NULL, NULL);
+        if (!m_autoScroll)
+            menu->AddItem(tr("Auto Scroll Lyrics"), NULL, NULL);
+    }
 
     menu->AddItem(tr("Other Options"), NULL, createMainMenu());
 
diff --git a/mythplugins/mythmusic/mythmusic/musiccommon.cpp b/mythplugins/mythmusic/mythmusic/musiccommon.cpp
index 79153a2..c7079c8 100644
--- a/mythplugins/mythmusic/mythmusic/musiccommon.cpp
+++ b/mythplugins/mythmusic/mythmusic/musiccommon.cpp
@@ -437,8 +437,9 @@ void MusicCommon::switchView(MusicView view)
 
         case MV_LYRICS:
         {
-            if (view != MV_VISUALIZER)
+            if (view != MV_VISUALIZER && view != MV_SEARCH)
                 return;
+            break;
         }
 
         case MV_RADIO: