diff --git a/command.c b/command.c
index 24de060f86..4ef46ab81c 100644
--- a/command.c
+++ b/command.c
@@ -2184,7 +2184,7 @@ bool command_event(enum event_command cmd, void *data)
          break;
       case CMD_EVENT_OVERLAY_SET_SCALE_FACTOR:
 #ifdef HAVE_OVERLAY
-         input_overlay_set_scale_factor(NULL, settings->input.overlay_scale);
+         input_overlay_set_scale_factor(overlay_ptr, settings->input.overlay_scale);
 #endif
          break;
       case CMD_EVENT_OVERLAY_SET_ALPHA_MOD:
diff --git a/input/input_overlay.c b/input/input_overlay.c
index 8a4e9867e3..d161f61c58 100644
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@@ -74,7 +74,7 @@ struct input_overlay
    enum overlay_status state;
 };
 
-static input_overlay_t *overlay_ptr = NULL;
+input_overlay_t *overlay_ptr = NULL;
 
 /**
  * input_overlay_scale:
@@ -150,9 +150,6 @@ void input_overlay_set_scale_factor(input_overlay_t *ol, float scale)
 {
    size_t i;
     
-   /* TODO/FIXME - Bad hackery. Should get rid of this */
-   if (!ol)
-      ol = overlay_ptr;
    if (!ol)
       return;
 
diff --git a/input/input_overlay.h b/input/input_overlay.h
index b04bda8e1a..e2292fcf42 100644
--- a/input/input_overlay.h
+++ b/input/input_overlay.h
@@ -244,6 +244,9 @@ bool input_overlay_is_alive(input_overlay_t *ol);
 
 void input_overlay_loaded(void *task_data, void *user_data, const char *err);
 
+/* FIXME - temporary. Globals are bad */
+extern input_overlay_t *overlay_ptr;
+
 RETRO_END_DECLS
 
 #endif