diff --git a/xbmc/video/windows/GUIWindowVideoNav.cpp b/xbmc/video/windows/GUIWindowVideoNav.cpp
index 5977c3bd32019..ab3a16176c7b4 100644
--- a/xbmc/video/windows/GUIWindowVideoNav.cpp
+++ b/xbmc/video/windows/GUIWindowVideoNav.cpp
@@ -509,6 +509,7 @@ bool CGUIWindowVideoNav::GetDirectory(const std::string &strDirectory, CFileItem
         newVideoVersion->SetLabel(g_localizeStrings.Get(40004));
         newVideoVersion->SetLabelPreformatted(true);
         newVideoVersion->SetSpecialSort(SortSpecialOnTop);
+        newVideoVersion->SetProperty("IsPlayable", false);
         items.Add(newVideoVersion);
       }
     }
@@ -817,7 +818,8 @@ void CGUIWindowVideoNav::GetContextButtons(int itemNumber, CContextButtons &butt
              item->GetVideoInfoTag()->m_type == MediaTypeMusicVideo || // musicvideos
              item->GetVideoInfoTag()->m_type == "tag" || // tags
              item->GetVideoInfoTag()->m_type == MediaTypeVideoCollection || // sets
-             item->GetVideoInfoTag()->m_type == MediaTypeVideoVersion)) // videoversions
+             (item->GetVideoInfoTag()->m_type == MediaTypeVideoVersion &&
+              item->GetVideoInfoTag()->m_iFileId != -1))) // videoversions for a certain video
         {
           buttons.Add(CONTEXT_BUTTON_EDIT, 16106);
         }