diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index 6446a54ab..3d0d38c0b 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -282,6 +282,9 @@ int GLFWView::run() {
         glfwWaitEvents();
     });
 
+    // Terminate here to save binary shaders
+    map->terminate();
+
     return 0;
 }
 
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index f78b8385c..99c8320a0 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -250,8 +250,6 @@ void Map::run() {
         mode = Mode::None;
         fileSource.clearLoop();
     }
-
-    terminate();
 }
 
 void Map::rerender() {