diff --git a/data/pref.xml b/data/pref.xml
index 06e8712a4..b9c5e5e57 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -143,6 +143,7 @@
       <option id="timeline_layer_panel_width" type="int" default="100" />
       <option id="show_menu_bar" type="bool" default="true" />
       <option id="recent_items" type="int" default="16" />
+      <option id="osx_async_view" type="bool" default="true" />
     </section>
     <section id="undo" text="Undo">
       <option id="size_limit" type="int" default="0" />
diff --git a/laf b/laf
index 241b7c9ff..9c6ecadd9 160000
--- a/laf
+++ b/laf
@@ -1 +1 @@
-Subproject commit 241b7c9ff09158d8432b3a9dbb0e68c6eed61b60
+Subproject commit 9c6ecadd9cbcfd2b87b7cfa61e01466013da3797
diff --git a/src/app/app.cpp b/src/app/app.cpp
index f2d0ff2d2..64bea3433 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -69,6 +69,10 @@
 #include "ui/ui.h"
 #include "ver/info.h"
 
+#ifdef __APPLE__
+#include "os/osx/system.h"
+#endif
+
 #include <iostream>
 #include <memory>
 
@@ -239,6 +243,11 @@ int App::initialize(const AppOptions& options)
     system->setTabletAPI(os::TabletAPI::Wintab);
 #endif
 
+#ifdef __APPLE__
+  if (!preferences().general.osxAsyncView())
+    os::osx_set_async_view(false);
+#endif
+
   system->setAppName(get_app_name());
   system->setAppMode(m_isGui ? os::AppMode::GUI:
                                os::AppMode::CLI);