diff --git a/game/graphics/pipelines/opengl.cpp b/game/graphics/pipelines/opengl.cpp
index 93299517db..8cd0be658c 100644
--- a/game/graphics/pipelines/opengl.cpp
+++ b/game/graphics/pipelines/opengl.cpp
@@ -373,10 +373,10 @@ void GLDisplay::update_fullscreen(GfxDisplayMode mode, int /*screen*/) {
         backup_params();
       }
       const GLFWvidmode* vmode = glfwGetVideoMode(monitor);
-      glfwSetWindowAttrib(m_window, GLFW_DECORATED, GLFW_TRUE);
+      glfwSetWindowAttrib(m_window, GLFW_DECORATED, GLFW_FALSE);
       glfwSetWindowFocusCallback(m_window, NULL);
       glfwSetWindowAttrib(m_window, GLFW_FLOATING, GLFW_FALSE);
-      glfwSetWindowMonitor(m_window, monitor, 0, 0, vmode->width, vmode->height, 60);
+      glfwSetWindowMonitor(m_window, monitor, 0, 0, vmode->width, vmode->height, GLFW_DONT_CARE);
       set_imgui_visible(false);
     } break;
     case GfxDisplayMode::Borderless: {
@@ -403,9 +403,10 @@ void GLDisplay::update_fullscreen(GfxDisplayMode mode, int /*screen*/) {
 GfxDisplayMode GLDisplay::get_fullscreen() {
   GLFWmonitor* monitor = glfwGetPrimaryMonitor();  // todo
   const GLFWvidmode* vmode = glfwGetVideoMode(monitor);
-  if (width() >= vmode->width && height() >= vmode->height) {
-    return glfwGetWindowAttrib(m_window, GLFW_DECORATED) == GLFW_TRUE ? GfxDisplayMode::Fullscreen
-                                                                      : GfxDisplayMode::Borderless;
+  if (glfwGetWindowMonitor(m_window) != NULL) {
+    return GfxDisplayMode::Fullscreen;
+  } else if (width() >= vmode->width && height() >= vmode->height) {
+    return GfxDisplayMode::Borderless;
   } else {
     return GfxDisplayMode::Windowed;
   }
diff --git a/goal_src/jak1/pc/pckernel.gc b/goal_src/jak1/pc/pckernel.gc
index a92e38b43c..c14ab0021a 100644
--- a/goal_src/jak1/pc/pckernel.gc
+++ b/goal_src/jak1/pc/pckernel.gc
@@ -97,7 +97,7 @@
   (set! (-> obj window-lock?) lock))
 
 (defmethod set-frame-rate! pc-settings ((obj pc-settings) (rate int))
-  "set the aspect ratio used for rendering."
+  "set the target framerate."
 
   (pc-set-frame-rate rate)
   (if (and (!= 'fullscreen (-> obj display-mode))