diff --git a/Makefile.common b/Makefile.common
index 698187ecd2..99fe407440 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -380,6 +380,7 @@ OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS)
 endif
 
 ifeq ($(HAVE_LIBUI), 1)
+DEFINES += -DHAVE_LIBUI
 ifeq ($(HAVE_GTKPLUS), 1)
 CFLAGS += -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0
 LIBS += -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0  -lgobject-2.0 -lglib-2.0
diff --git a/command.c b/command.c
index 85d710d5df..01c0d61e0d 100644
--- a/command.c
+++ b/command.c
@@ -2605,7 +2605,7 @@ bool command_event(enum event_command cmd, void *data)
          command_event_restore_default_shader_preset();
          break;
       case CMD_EVENT_LIBUI_TEST:
-#if 1
+#if HAVE_LIBUI
          libui_main();
 #endif
          break;
diff --git a/retroarch.c b/retroarch.c
index 5994412daa..273876455f 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2424,10 +2424,10 @@ static enum runloop_state runloop_check_state(
             current_input, RARCH_GRAB_MOUSE_TOGGLE);
 
       if (pressed && !old_pressed)
-#if 0
-         command_event(CMD_EVENT_GRAB_MOUSE_TOGGLE, NULL);
-#else
+#if HAVE_LIBUI
          command_event(CMD_EVENT_LIBUI_TEST, NULL);
+#else
+         command_event(CMD_EVENT_GRAB_MOUSE_TOGGLE, NULL);
 #endif
 
       old_pressed             = pressed;