diff --git a/Makefile.common b/Makefile.common
index cecb9e82c9..1ef18f29a6 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -348,7 +348,6 @@ ifeq ($(HAVE_SLANG), 1)
    HAVE_SHADERS_COMMON = 1
 endif
 
-
 # Qt WIMP GUI
 
 ifeq ($(HAVE_OPENSSL), 1)
@@ -791,6 +790,11 @@ ifeq ($(HAVE_LAKKA_SWITCH), 1)
    DEFINES += -DHAVE_LAKKA_SWITCH
 endif
 
+# Does not depend on HAVE_MENU
+ifeq ($(HAVE_SHADERS_COMMON),1)
+   OBJ += menu/menu_shader.o
+endif
+
 ifeq ($(HAVE_MENU_COMMON), 1)
    OBJ += menu/menu_driver.o \
           menu/menu_content.o \
@@ -824,11 +828,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
           menu/drivers/menu_generic.o \
           menu/drivers/null.o \
           menu/menu_thumbnail_path.o \
-			 menu/drivers_display/menu_display_null.o
-
-   ifeq ($(HAVE_SHADERS_COMMON),1)
-      OBJ += menu/menu_shader.o
-   endif
+          menu/drivers_display/menu_display_null.o
 
    ifeq ($(HAVE_MENU_WIDGETS), 1)
       OBJ += menu/widgets/menu_widgets.o
diff --git a/tasks/task_content.c b/tasks/task_content.c
index a3f8f69daf..b6b6b3ffdf 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -629,10 +629,8 @@ static bool content_load(content_ctx_info_t *info)
       content_clear_subsystem();
    }
 
-#if defined(HAVE_MENU)
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
    menu_shader_manager_init();
-#endif
 #endif
 
    command_event(CMD_EVENT_HISTORY_INIT, NULL);