diff --git a/flutter/lib/main.dart b/flutter/lib/main.dart
index 80a3bff89..91773afe7 100644
--- a/flutter/lib/main.dart
+++ b/flutter/lib/main.dart
@@ -147,9 +147,15 @@ void runMainApp(bool startService) async {
   gFFI.userModel.refreshCurrentUser();
   runApp(App());
 
+  bool? alwaysOnTop;
+  if (isDesktop) {
+    alwaysOnTop =
+        bind.mainGetBuildinOption(key: "main-window-always-on-top") == 'Y';
+  }
+
   // Set window option.
-  WindowOptions windowOptions =
-      getHiddenTitleBarWindowOptions(isMainWindow: true);
+  WindowOptions windowOptions = getHiddenTitleBarWindowOptions(
+      isMainWindow: true, alwaysOnTop: alwaysOnTop);
   windowManager.waitUntilReadyToShow(windowOptions, () async {
     // Restore the location of the main window before window hide or show.
     await restoreWindowPosition(WindowType.Main);
diff --git a/libs/hbb_common b/libs/hbb_common
index 221c2bfb3..5b6c0cf49 160000
--- a/libs/hbb_common
+++ b/libs/hbb_common
@@ -1 +1 @@
-Subproject commit 221c2bfb3e60139cd0db6bfb06ec950afb17a66c
+Subproject commit 5b6c0cf49a6773ccca9c9e9bf18ebc8716734873