diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp
index cd5293905..6ea9f9c0f 100644
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -60,6 +60,8 @@ MainWindow::MainWindow(QWidget *parent) :
     statusBar()->setStyleSheet("QStatusBar::item {border: None;}");
 
     this->setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico"));
+    this->setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, vid_resize != 1);
+    this->setWindowFlag(Qt::WindowMaximizeButtonHint, vid_resize == 1);
 
     connect(this, &MainWindow::showMessageForNonQtThread, this, &MainWindow::showMessage_, Qt::BlockingQueuedConnection);
 
@@ -284,7 +286,6 @@ void MainWindow::closeEvent(QCloseEvent *event) {
             event->ignore();
             return;
         }
-        config_save();
     }
     if (window_remember) {
         window_w = ui->stackedWidget->width();
@@ -294,6 +295,7 @@ void MainWindow::closeEvent(QCloseEvent *event) {
             window_y = this->geometry().y();
         }
     }
+    config_save();
     event->accept();
 }
 
@@ -302,8 +304,10 @@ MainWindow::~MainWindow() {
 }
 
 void MainWindow::showEvent(QShowEvent *event) {
+    if (shownonce) return;
+    shownonce = true;
     if (window_remember && !QApplication::platformName().contains("wayland")) {
-        setGeometry(window_x, window_y, window_w, window_h);
+        setGeometry(window_x, window_y, window_w, window_h + menuBar()->height() + (hide_status_bar ? 0 : statusBar()->height()));
     }
     if (vid_resize == 2) {
         setFixedSize(fixed_size_x, fixed_size_y + this->menuBar()->height() + this->statusBar()->height());
@@ -1034,10 +1038,16 @@ void MainWindow::focusOutEvent(QFocusEvent* event)
 void MainWindow::on_actionResizable_window_triggered(bool checked) {
     if (checked) {
         vid_resize = 1;
+        setWindowFlag(Qt::WindowMaximizeButtonHint);
+        setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, false);
         setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
     } else {
         vid_resize = 0;
+        setWindowFlag(Qt::WindowMaximizeButtonHint, false);
+        setWindowFlag(Qt::MSWindowsFixedSizeDialogHint);
     }
+    show();
+
     ui->menuWindow_scale_factor->setEnabled(! checked);
     emit resizeContents(scrnsz_x, scrnsz_y);
 }
diff --git a/src/qt/qt_mainwindow.hpp b/src/qt/qt_mainwindow.hpp
index 5cc49c6b0..126ecaccd 100644
--- a/src/qt/qt_mainwindow.hpp
+++ b/src/qt/qt_mainwindow.hpp
@@ -115,6 +115,9 @@ private:
     
     /* If main window should send keyboard input */
     bool send_keyboard_input = true;
+    bool shownonce = false;
+
+    friend class SpecifyDimensions;
 };
 
 #endif // QT_MAINWINDOW_HPP
diff --git a/src/qt/qt_specifydimensions.cpp b/src/qt/qt_specifydimensions.cpp
index 4ef9ae76d..85da6212b 100644
--- a/src/qt/qt_specifydimensions.cpp
+++ b/src/qt/qt_specifydimensions.cpp
@@ -2,9 +2,11 @@
 #include "ui_qt_specifydimensions.h"
 
 #include "qt_mainwindow.hpp"
+#include "ui_qt_mainwindow.h"
 
 #include <QStatusBar>
 #include <QMenuBar>
+#include <QTimer>
 
 extern "C"
 {
@@ -38,14 +40,18 @@ void SpecifyDimensions::on_SpecifyDimensions_accepted()
     if (ui->checkBox->isChecked())
     {
         vid_resize = 2;
+        main_window->setWindowFlag(Qt::WindowMaximizeButtonHint, false);
+        main_window->setWindowFlag(Qt::MSWindowsFixedSizeDialogHint);
         window_remember = 0;
         fixed_size_x = ui->spinBoxWidth->value();
         fixed_size_y = ui->spinBoxHeight->value();
         main_window->setFixedSize(ui->spinBoxWidth->value(), ui->spinBoxHeight->value() + (hide_status_bar ? main_window->statusBar()->height() : 0) + main_window->menuBar()->height());
         emit main_window->updateMenuResizeOptions();
+        main_window->show();
     }
     else
     {
+        if (vid_resize != 1) main_window->ui->actionResizable_window->trigger();
         vid_resize = 0;
         window_remember = 1;
         window_w = ui->spinBoxWidth->value();
@@ -55,6 +61,7 @@ void SpecifyDimensions::on_SpecifyDimensions_accepted()
         vid_resize = 1;
         emit main_window->updateMenuResizeOptions();
     }
+    main_window->show();
     emit main_window->updateWindowRememberOption();
 }