diff --git a/dmserver/BUILD.gn b/dmserver/BUILD.gn
index 3fffd2f1..de891ae2 100644
--- a/dmserver/BUILD.gn
+++ b/dmserver/BUILD.gn
@@ -70,6 +70,12 @@ ohos_shared_library("libdms") {
     "ipc:ipc_core",
   ]
 
+  if (is_standard_system) {
+    external_deps += [ "startup_l2:syspara" ]
+  } else {
+    external_deps += [ "startup:syspara" ]
+  }
+
   part_name = "window_manager"
   subsystem_name = "window"
 }
diff --git a/wmserver/BUILD.gn b/wmserver/BUILD.gn
index b7dba155..8766011c 100644
--- a/wmserver/BUILD.gn
+++ b/wmserver/BUILD.gn
@@ -104,6 +104,12 @@ ohos_shared_library("libwms") {
     "ipc:ipc_core",
   ]
 
+  if (is_standard_system) {
+    external_deps += [ "startup_l2:syspara" ]
+  } else {
+    external_deps += [ "startup:syspara" ]
+  }
+
   part_name = "window_manager"
   subsystem_name = "window"
 }
diff --git a/wmserver/include/window_manager_service.h b/wmserver/include/window_manager_service.h
index d364d815..1a3b46ac 100644
--- a/wmserver/include/window_manager_service.h
+++ b/wmserver/include/window_manager_service.h
@@ -21,6 +21,7 @@
 
 #include <input_window_monitor.h>
 #include <nocopyable.h>
+#include <parameters.h>
 #include <system_ability.h>
 #include "singleton_delegator.h"
 #include "wm_single_instance.h"
@@ -80,7 +81,6 @@ private:
     sptr<WindowController> windowController_;
     sptr<InputWindowMonitor> inputWindowMonitor_;
     sptr<SnapshotController> snapshotController_;
-    const int WAITING_RS_TIME = 10;
 };
 }
 }
diff --git a/wmserver/src/window_manager_service.cpp b/wmserver/src/window_manager_service.cpp
index 00cb0be3..3ff2551a 100644
--- a/wmserver/src/window_manager_service.cpp
+++ b/wmserver/src/window_manager_service.cpp
@@ -73,7 +73,6 @@ bool WindowManagerService::Init()
         return false;
     }
     WLOGFI("WindowManagerService::Init success");
-    sleep(WAITING_RS_TIME); // for RS temporary
     return true;
 }
 
@@ -112,6 +111,11 @@ WMError WindowManagerService::AddWindow(sptr<WindowProperty>& property)
     if (res == WMError::WM_OK) {
         inputWindowMonitor_->UpdateInputWindow(property->GetWindowId());
     }
+    if (property->GetWindowType() == WindowType::WINDOW_TYPE_NAVIGATION_BAR
+        || property->GetWindowType() == WindowType::WINDOW_TYPE_STATUS_BAR) {
+        WLOGFI("WindowManagerService::AddWindow System Window called");
+        system::SetParameter("persist.window.boot.inited", "1");
+    }
     return res;
 }