diff --git a/examples/boing.c b/examples/boing.c
index e55d8d1c..45c867fd 100644
--- a/examples/boing.c
+++ b/examples/boing.c
@@ -237,9 +237,13 @@ void reshape( GLFWwindow* window, int w, int h )
 
 void key_callback( GLFWwindow* window, int key, int scancode, int action, int mods )
 {
-    if (key == GLFW_KEY_ESCAPE && action == GLFW_PRESS)
+    if (action != GLFW_PRESS)
+        return;
+
+    if (key == GLFW_KEY_ESCAPE && mods == 0)
         glfwSetWindowShouldClose(window, GLFW_TRUE);
-    if (key == GLFW_KEY_ENTER && action == GLFW_PRESS && mods == GLFW_MOD_ALT)
+    if ((key == GLFW_KEY_ENTER && mods == GLFW_MOD_ALT) ||
+        (key == GLFW_KEY_F11 && mods == GLFW_MOD_ALT))
     {
         if (glfwGetWindowMonitor(window))
         {
diff --git a/tests/iconify.c b/tests/iconify.c
index 7990c08f..87034598 100644
--- a/tests/iconify.c
+++ b/tests/iconify.c
@@ -76,6 +76,7 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action,
         case GLFW_KEY_ESCAPE:
             glfwSetWindowShouldClose(window, GLFW_TRUE);
             break;
+        case GLFW_KEY_F11:
         case GLFW_KEY_ENTER:
         {
             if (mods != GLFW_MOD_ALT)