diff --git a/main.cpp b/main.cpp
index 759892d2c..69f99ee5e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -113,6 +113,10 @@ int main(int argc, char *argv[]) {
 
   QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
 
+  QSurfaceFormat format;
+  format.setDepthBufferSize(24);
+  QSurfaceFormat::setDefaultFormat(format);
+
   QApplication a(argc, argv);
   a.setWindowIcon(QIcon(":/icons/olive64.png"));
 
diff --git a/ui/viewerwidget.cpp b/ui/viewerwidget.cpp
index 4969ec931..eb3f139c7 100644
--- a/ui/viewerwidget.cpp
+++ b/ui/viewerwidget.cpp
@@ -74,10 +74,6 @@ ViewerWidget::ViewerWidget(QWidget *parent) :
   setMouseTracking(true);
   setFocusPolicy(Qt::ClickFocus);
 
-  QSurfaceFormat format;
-  format.setDepthBufferSize(24);
-  setFormat(format);
-
   setContextMenuPolicy(Qt::CustomContextMenu);
   connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(show_context_menu()));