diff --git a/flutter/lib/main.dart b/flutter/lib/main.dart
index b3dbea86cedbe..b52d2e4157705 100644
--- a/flutter/lib/main.dart
+++ b/flutter/lib/main.dart
@@ -259,6 +259,7 @@ showCmWindow({bool isStartup = false}) async {
     // ensure initial window size to be changed
     await windowManager.setSizeAlignment(
         kConnectionManagerWindowSizeClosedChat, Alignment.topRight);
+    await windowManager.setAlwaysOnTop(true); // HickelSOFT Test
     _isCmReadyToShow = true;
   } else if (_isCmReadyToShow) {
     if (await windowManager.getOpacity() != 1) {
@@ -267,6 +268,7 @@ showCmWindow({bool isStartup = false}) async {
       await windowManager.minimize(); //needed
       await windowManager.setSizeAlignment(
           kConnectionManagerWindowSizeClosedChat, Alignment.topRight);
+      await windowManager.setAlwaysOnTop(true); // HickelSOFT Test
       windowOnTop(null);
     }
   }