diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index 3f1f2140..a0e0287f 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -214,9 +214,14 @@ void BaseWindow::init()
         });
     }
 #else
-//    if (getSettings()->windowTopMost.getValue()) {
-//        this->setWindowFlag(Qt::WindowStaysOnTopHint);
-//    }
+    // TopMost flag overrides setting
+    if (!this->flags_.has(TopMost))
+    {
+        getSettings()->windowTopMost.connect([this](bool topMost, auto) {
+            this->setWindowFlag(Qt::WindowStaysOnTopHint, topMost);
+            this->show();
+        });
+    }
 #endif
 }