diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java b/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java
index 6917a6c9..a08a2b2d 100644
--- a/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java
+++ b/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java
@@ -635,7 +635,13 @@ public class GLFW
     public static GLFWWindowProperties internalGetWindow(long window) {
         GLFWWindowProperties win = mGLFWWindowMap.get(window);
         if (win == null) {
-            throw new IllegalArgumentException("No window pointer found: " + window);
+            System.err.println("GLFW: No window pointer found: " + window);
+            win = mGLFWWindowMap.get(mainContext);
+            // throw new IllegalArgumentException("No window pointer found: " + window);
+        }
+        if (win == null) {
+            System.err.println("GLFW: Stills no window pointer found: " + window);
+            win = mGLFWWindowMap.valueAt(0);
         }
         return win;
     }
diff --git a/Natives/SurfaceViewController.m b/Natives/SurfaceViewController.m
index 14c32ea0..a53ece53 100644
--- a/Natives/SurfaceViewController.m
+++ b/Natives/SurfaceViewController.m
@@ -121,7 +121,7 @@ BOOL shouldTriggerClick = NO;
 
     ADD_BUTTON_VISIBLE(@"Esc", escape, CGRectMake(width - 5 - 80, height - 5 - 30, BTN_RECT));
 
-    // ADD_BUTTON_VISIBLE(@"Fullscreen", f11, CGRectMake(width - 5 - 80, 5, BTN_RECT));
+    ADD_BUTTON_VISIBLE(@"Fullscreen", f11, CGRectMake(width - 5 - 80, 5, BTN_RECT));
     
     [self.view addSubview:inputView];
     [inputView becomeFirstResponder];
@@ -262,7 +262,7 @@ ADD_BUTTON_DEF(special_mouse_sec) {
 
 ADD_BUTTON_DEF_KEY(f3, GLFW_KEY_F3)
 ADD_BUTTON_DEF_KEY(f5, GLFW_KEY_F5)
-// ADD_BUTTON_DEF_KEY(f11, GLFW_KEY_F11)
+ADD_BUTTON_DEF_KEY(f11, GLFW_KEY_F11)
 ADD_BUTTON_DEF_KEY(t, GLFW_KEY_T)
 ADD_BUTTON_DEF_KEY(c, GLFW_KEY_C)
 ADD_BUTTON_DEF_KEY(f, GLFW_KEY_F)