diff --git a/gfx/gl.c b/gfx/gl.c
index 5ecfc651a6..e3e16dd854 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -2466,7 +2466,7 @@ static bool gl_has_windowed(void *data)
    gl_t *gl = (gl_t*)data;
 
    if (gl && gl->ctx_driver)
-      gl->ctx_driver->has_windowed(gl);
+      return gl->ctx_driver->has_windowed(gl);
    return true;
 }
 
diff --git a/retroarch.c b/retroarch.c
index 358bba048a..4c0aef40e1 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2604,6 +2604,13 @@ bool rarch_main_command(unsigned cmd)
          }
          break;
       case RARCH_CMD_FULLSCREEN_TOGGLE:
+         if (!driver.video)
+            return false;
+         if (!driver.video->has_windowed(driver.video_data))
+            return false;
+
+         RARCH_LOG("Gets here mothafuckah!\n");
+
          /* If we go fullscreen we drop all drivers and 
           * reinitialize to be safe. */
          g_settings.video.fullscreen = !g_settings.video.fullscreen;