Index: apps/playlist_viewer.c
===================================================================
RCS file: /cvsroot/rockbox/apps/playlist_viewer.c,v
retrieving revision 1.46
diff -p -u -d -r1.46 playlist_viewer.c
--- apps/playlist_viewer.c	3 Apr 2006 04:13:26 -0000	1.46
+++ apps/playlist_viewer.c	10 Apr 2006 21:40:31 -0000
@@ -767,14 +767,20 @@ bool playlist_viewer_ex(char* filename)
                 gui_synclist_draw(&playlist_lists);
                 break;
             }
-#ifdef TREE_MENU_PRE
-            case TREE_MENU_PRE:
-#else
-            case TREE_MENU:
-#endif
+
 #ifdef TREE_RC_MENU
             case TREE_RC_MENU:
 #endif
+            case TREE_MENU:
+#ifdef TREE_MENU_PRE
+                if (((button == TREE_MENU)
+#ifdef TREE_RC_MENU_PRE
+                    || (button == TREE_RC_MENU))
+                        && ((lastbutton != TREE_RC_MENU_PRE)
+#endif
+                    && (lastbutton != TREE_MENU_PRE)))
+                    break;
+#endif
                 if (viewer_menu())
                 {
                     ret = true;