diff --git a/command_event.c b/command_event.c
index 6b69186e38..8ebeff51bf 100644
--- a/command_event.c
+++ b/command_event.c
@@ -30,6 +30,7 @@
 
 #ifdef HAVE_MENU
 #include "menu/menu.h"
+#include "menu/menu_display.h"
 #include "menu/menu_shader.h"
 #include "menu/menu_input.h"
 #endif
@@ -1094,7 +1095,7 @@ bool event_command(enum event_command cmd)
          {
             menu_handle_t *menu = menu_driver_get_ptr();
             
-            if (menu)
+            if (menu && menu_display_fb_in_use())
                menu->framebuf.dirty = true;
 
             if (runloop->is_menu)
diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index 08db30ea50..dac650f98c 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -437,7 +437,10 @@ int menu_entry_iterate(unsigned action)
       return -1;
 
    if (action != MENU_ACTION_NOOP || menu_needs_refresh() || menu_display_update_pending())
-      menu->framebuf.dirty   = true;
+   {
+      if (menu_display_fb_in_use())
+         menu->framebuf.dirty   = true;
+   }
 
    cbs = (menu_file_list_cbs_t*)menu_list_get_last_stack_actiondata(menu_list);