diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets
index ccf79cab541965f6089591d04b4e3db9d4474b12..c37045cf9002e64283842fc78329abc0b061e376 100644
--- a/entry/src/main/ets/entryability/EntryAbility.ets
+++ b/entry/src/main/ets/entryability/EntryAbility.ets
@@ -46,8 +46,7 @@ export default class EntryAbility extends UIAbility {
       }
       hilog.info(DOMAIN, 'testTag', 'Succeeded in loading the content.');
       this.windowUtil!.setUIContext();
-      this.windowUtil!.setImmersiveType(ImmersiveType.IMMERSIVE);
-      this.windowUtil!.setFreeWindowImmersiveType(FreeWindowImmersiveType.FREE_WINDOW_IMMERSIVE);
+      this.windowUtil!.setImmersiveType(ImmersiveType.IMMERSIVE, FreeWindowImmersiveType.FREE_WINDOW_IMMERSIVE);
       this.windowUtil!.updateWindowInfo();
     });
   }
diff --git a/entry/src/main/ets/utils/WindowUtil.ets b/entry/src/main/ets/utils/WindowUtil.ets
index 3f73158b41377a49d94c16f7ef73862b2d63330a..7af4d518dc1d789c01642397d8501719677d17c2 100644
--- a/entry/src/main/ets/utils/WindowUtil.ets
+++ b/entry/src/main/ets/utils/WindowUtil.ets
@@ -71,7 +71,7 @@ export class WindowUtil {
     this.mainWindow = mainWindow;
   }
 
-  setImmersiveType(type: ImmersiveType) {
+  setImmersiveType(type: ImmersiveType, freeWindowType: FreeWindowImmersiveType) {
     if (type === ImmersiveType.NORMAL) {
       this.mainWindow.setWindowLayoutFullScreen(false)
         .then(() => {
@@ -114,19 +114,17 @@ export class WindowUtil {
       this.setSystemBarEnabled(false);
     }
     this.mainWindowInfo.isImmersive = type;
-  }
-  // [EndExclude FreeWindowImmersive]
-  setFreeWindowImmersiveType(type: FreeWindowImmersiveType) {
+
+    // [EndExclude FreeWindowImmersive]
     // Only used after the function loadContent() or setUIContent().
-    if (type === FreeWindowImmersiveType.FREE_WINDOW_NORMAL) {
+    if (freeWindowType === FreeWindowImmersiveType.FREE_WINDOW_NORMAL) {
       this.mainWindow.setWindowDecorVisible(true);
     } else {
       this.mainWindow.setWindowDecorVisible(false);
     }
-    this.mainWindowInfo.isFreeWindowImmersive = type;
+    this.mainWindowInfo.isFreeWindowImmersive = freeWindowType;
+    // [StartExclude FreeWindowImmersive]
   }
-  // [StartExclude FreeWindowImmersive]
-
 
   setUIContext() {
     this.uiContext = this.mainWindow.getUIContext();
@@ -267,7 +265,7 @@ export class WindowUtil {
       minWidth: minWidth,
       minHeight: minHeight
     }
-    let promise = this.mainWindow!.setWindowLimits(windowLimits);
+    let promise = this.mainWindow.setWindowLimits(windowLimits);
     promise.then((data: window.WindowLimits) => {
       hilog.info(0x0000, 'testLog', `Succeeded in changing the window limits. Cause: ${JSON.stringify(data)}`);
     }).catch((err: BusinessError) => {
@@ -280,7 +278,7 @@ export class WindowUtil {
 
   // [Start resize]
   resize(width: number, height: number): void {
-    this.mainWindow!.resize(width, height, (err: BusinessError) => {
+    this.mainWindow.resize(width, height, (err: BusinessError) => {
       const errCode: number = err.code;
       if (errCode) {
         hilog.error(0x0000, 'testLog',