diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp
index ccaf6964f..b3d0d9fa9 100644
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -798,6 +798,30 @@ MainWindow::closeEvent(QCloseEvent *event)
     event->accept();
 }
 
+void
+MainWindow::resizeEvent(QResizeEvent *event)
+{
+    //qDebug() << pos().x() + event->size().width();
+    //qDebug() << pos().y() + event->size().height();
+    if (vid_resize == 1)
+        return;
+
+    int newX = pos().x();
+    int newY = pos().y();
+
+    if (((frameGeometry().x() + event->size().width() + 1) > util::screenOfWidget(this)->availableGeometry().right())) {
+        //move(util::screenOfWidget(this)->availableGeometry().right() - size().width() - 1, pos().y());
+        newX = util::screenOfWidget(this)->availableGeometry().right() - frameGeometry().width() - 1;
+        if (newX < 1) newX = 1;
+    }
+
+    if (((frameGeometry().y() + event->size().height() + 1) > util::screenOfWidget(this)->availableGeometry().bottom())) {
+        newY = util::screenOfWidget(this)->availableGeometry().bottom() - frameGeometry().height() - 1;
+        if (newY < 1) newY = 1;
+    }
+    move(newX, newY);
+}
+
 void
 MainWindow::initRendererMonitorSlot(int monitor_index)
 {
diff --git a/src/qt/qt_mainwindow.hpp b/src/qt/qt_mainwindow.hpp
index 479ed38a4..f1c6cadf6 100644
--- a/src/qt/qt_mainwindow.hpp
+++ b/src/qt/qt_mainwindow.hpp
@@ -137,6 +137,7 @@ protected:
     void showEvent(QShowEvent *event) override;
     void closeEvent(QCloseEvent *event) override;
     void changeEvent(QEvent *event) override;
+    void resizeEvent(QResizeEvent *event) override;
 
 private slots:
     void on_actionPen_triggered();
diff --git a/src/qt/qt_rendererstack.hpp b/src/qt/qt_rendererstack.hpp
index 54ea49bb9..172dc2fe6 100644
--- a/src/qt/qt_rendererstack.hpp
+++ b/src/qt/qt_rendererstack.hpp
@@ -7,6 +7,7 @@
 #include <QStackedWidget>
 #include <QWidget>
 #include <QCursor>
+#include <QScreen>
 
 #include <atomic>
 #include <memory>
@@ -14,6 +15,7 @@
 #include <vector>
 
 #include "qt_renderercommon.hpp"
+#include "qt_util.hpp"
 
 #include <atomic>
 
@@ -21,6 +23,11 @@ namespace Ui {
 class RendererStack;
 }
 
+extern "C"
+{
+    extern int vid_resize;
+}
+
 class RendererCommon;
 class RendererStack : public QStackedWidget {
     Q_OBJECT
@@ -43,6 +50,22 @@ public:
     void changeEvent(QEvent *event) override;
     void resizeEvent(QResizeEvent *event) override
     {
+        if (this->m_monitor_index != 0 && vid_resize != 1) {
+            int newX = pos().x();
+            int newY = pos().y();
+        
+            if (((frameGeometry().x() + event->size().width() + 1) > util::screenOfWidget(this)->availableGeometry().right())) {
+                //move(util::screenOfWidget(this)->availableGeometry().right() - size().width() - 1, pos().y());
+                newX = util::screenOfWidget(this)->availableGeometry().right() - frameGeometry().width() - 1;
+                if (newX < 1) newX = 1;
+            }
+        
+            if (((frameGeometry().y() + event->size().height() + 1) > util::screenOfWidget(this)->availableGeometry().bottom())) {
+                newY = util::screenOfWidget(this)->availableGeometry().bottom() - frameGeometry().height() - 1;
+                if (newY < 1) newY = 1;
+            }
+            move(newX, newY);
+        }
         onResize(event->size().width(), event->size().height());
     }
     void keyPressEvent(QKeyEvent *event) override