diff --git a/include/mbgl/platform/default/glfw_view.hpp b/include/mbgl/platform/default/glfw_view.hpp
index 87710ff43..1afb25d14 100644
--- a/include/mbgl/platform/default/glfw_view.hpp
+++ b/include/mbgl/platform/default/glfw_view.hpp
@@ -29,22 +29,23 @@ public:
     // The expected action is to set a new style, different to the current one.
     void setChangeStyleCallback(std::function<void()> callback);
 
+    void setShouldClose();
+
     void run();
     void fps();
 
-    GLFWwindow *window = nullptr;
-
 private:
     bool fullscreen = false;
+    bool tracking = false;
+    bool rotating = false;
 
     double lastX = 0, lastY = 0;
-    bool tracking = false;
-
-    bool rotating = false;
 
     double lastClick = -1;
 
     std::function<void()> changeStyleCallback;
+
+    GLFWwindow *window = nullptr;
 };
 
 #endif
diff --git a/linux/main.cpp b/linux/main.cpp
index 2361c996d..c295eb18e 100644
--- a/linux/main.cpp
+++ b/linux/main.cpp
@@ -23,8 +23,7 @@ std::unique_ptr<GLFWView> view;
 void quit_handler(int) {
     if (view) {
         mbgl::Log::Info(mbgl::Event::Setup, "waiting for quit...");
-        glfwSetWindowShouldClose(view->window, true);
-        glfwPostEmptyEvent();
+        view->setShouldClose();
     } else {
         exit(0);
     }
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index bfe188260..286be5d8a 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -314,6 +314,11 @@ void GLFWView::setChangeStyleCallback(std::function<void()> callback) {
     changeStyleCallback = callback;
 }
 
+void GLFWView::setShouldClose() {
+    glfwSetWindowShouldClose(window, true);
+    glfwPostEmptyEvent();
+}
+
 namespace mbgl {
 namespace platform {