diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
index 8715c8d6e5..ec6bd23f5f 100644
--- a/src/Gui/Application.cpp
+++ b/src/Gui/Application.cpp
@@ -308,6 +308,13 @@ Application::Application(bool GUIenabled)
         Translator::instance()->activateLanguage(hPGrp->GetASCII("Language", (const char*)lang.toLatin1()).c_str());
         GetWidgetFactorySupplier();
 
+        // Coin3d disabled VBO support for all Intel drivers but in the meantime they have improved
+        // so we can try to override the workaround by setting COIN_VBO
+        ParameterGrp::handle hViewGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View");
+        if (hViewGrp->GetBool("UseVBO",false)) {
+            (void)coin_setenv("COIN_VBO", "1", true);
+        }
+
         // Check for the symbols for group separator and deciaml point. They must be different otherwise
         // Qt doesn't work properly.
 #if defined(Q_OS_WIN32)