Index: apps/onplay.c
===================================================================
--- apps/onplay.c	(revision 24666)
+++ apps/onplay.c	(working copy)
@@ -422,6 +422,13 @@
     {
         return ACTION_EXIT_MENUITEM;
     }
+#ifdef HAVE_TAGCACHE
+    if (context == CONTEXT_ID3DB &&
+        ((selected_file_attr & FILE_ATTR_MASK) != FILE_ATTR_AUDIO))
+    {
+        return ACTION_EXIT_MENUITEM;
+    }
+#endif
 
     switch (action)
     {
@@ -430,14 +437,12 @@
             {
                 return action;
             }
-            else if (((audio_status() & AUDIO_STATUS_PLAY &&
-                      context == CONTEXT_WPS) ||
-                      context == CONTEXT_TREE))
+            else if ((audio_status() & AUDIO_STATUS_PLAY) ||
+                     context != CONTEXT_WPS)
             {
                 return action;
             }
-            else
-                return ACTION_EXIT_MENUITEM;
+            return ACTION_EXIT_MENUITEM;
             break;
     }
     return action;
@@ -1064,7 +1069,13 @@
 #endif
 #ifdef HAVE_TAGCACHE
             if (context == CONTEXT_ID3DB)
+            {
+                if (((selected_file_attr & FILE_ATTR_MASK) ==
+                        FILE_ATTR_AUDIO) &&
+                    this_item == &properties_item)
+                    return action;
                 return ACTION_EXIT_MENUITEM;
+            }
 #endif
             if (this_item == &clipboard_paste_item)
             {  /* visible if there is something to paste */