diff --git a/src/blackgui/dockwidget.cpp b/src/blackgui/dockwidget.cpp
index 38d92edad..b44ccb5cd 100644
--- a/src/blackgui/dockwidget.cpp
+++ b/src/blackgui/dockwidget.cpp
@@ -21,6 +21,7 @@
 #include <QLayoutItem>
 #include <QMenu>
 #include <QScopedPointer>
+#include <QScreen>
 #include <QSettings>
 #include <QSizePolicy>
 #include <QStatusBar>
@@ -616,6 +617,6 @@ namespace BlackGui
     {
         // center on screen when floating
         if (!this->isFloating()) { return; }
-        this->move(QApplication::desktop()->screen()->rect().center() - this->rect().center());
+        this->move(sGui->currentScreen()->geometry().center() - this->rect().center());
     }
 } // namespace
diff --git a/src/blackgui/views/viewbasenontemplate.cpp b/src/blackgui/views/viewbasenontemplate.cpp
index 7dc3005e5..9e3c93a22 100644
--- a/src/blackgui/views/viewbasenontemplate.cpp
+++ b/src/blackgui/views/viewbasenontemplate.cpp
@@ -11,6 +11,7 @@
 #include "blackgui/dockwidgetinfoarea.h"
 #include "blackgui/filters/filterdialog.h"
 #include "blackgui/filters/filterwidget.h"
+#include "blackgui/guiapplication.h"
 #include "blackgui/guiutility.h"
 #include "blackgui/loadindicator.h"
 #include "blackgui/menus/fontmenus.h"
@@ -764,7 +765,8 @@ namespace BlackGui
             if (m_forceColumnsToMaxSize)
             {
                 // vpNew.setWidth(std::numeric_limits<qint32>::max()); // largest finite value
-                const QRect screenGeometry = QApplication::desktop()->screenGeometry();
+                QGuiApplication::screens();
+                const QRect screenGeometry = sGui->currentScreen()->geometry();
                 QRect vpNew = vpOriginal;
                 vpNew.setWidth(screenGeometry.width());
                 this->viewport()->setGeometry(vpNew);