diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets
index ef952b2534a434c85bbba2b2655bb5fa73ac4ddf..e8e5d845c0cdc092ee911e15f413f938254bfa07 100644
--- a/entry/src/main/ets/entryability/EntryAbility.ets
+++ b/entry/src/main/ets/entryability/EntryAbility.ets
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { AbilityConstant, Configuration, ConfigurationConstant, UIAbility, Want } from '@kit.AbilityKit';
+import { Configuration, ConfigurationConstant, UIAbility } from '@kit.AbilityKit';
 import { display, window } from '@kit.ArkUI';
 import { hilog } from '@kit.PerformanceAnalysisKit';
 import { BusinessError } from '@kit.BasicServicesKit';
@@ -66,16 +66,22 @@ export default class EntryAbility extends UIAbility {
   onWindowStageCreate(windowStage: window.WindowStage): void {
     windowStage.getMainWindow().then((windowObj: window.Window) => {
       try {
-        let type = window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR;
-        let avoidArea = windowObj.getWindowAvoidArea(type);
+        let avoidArea = windowObj.getWindowAvoidArea(window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR);
         let bottomRectHeight = avoidArea.bottomRect.height;
         AppStorage.setOrCreate('bottomRectHeight', bottomRectHeight);
-        type = window.AvoidAreaType.TYPE_SYSTEM;
-        avoidArea = windowObj.getWindowAvoidArea(type);
+        avoidArea = windowObj.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM);
         let topRectHeight = avoidArea.topRect.height;
         AppStorage.setOrCreate('topRectHeight', topRectHeight);
         this.windowObj = windowObj;
         this.updateBreakpoint(windowObj.getWindowProperties().windowRect.width);
+
+        windowObj.setWindowLayoutFullScreen(true).then(() => {
+          hilog.info(0x0000, 'testTag', '%{public}s', 'Succeeded in setting the window layout to full-screen mode.');
+        }).catch((err: BusinessError) => {
+          hilog.error(0x0000, 'testTag',
+            `Failed to set the window layout to full-screen mode, err code: ${err.code}, message: ${err.message}}`);
+        });
+
         windowObj.on('windowSizeChange', (windowSize) => {
           this.updateBreakpoint(windowSize.width);
         });
@@ -98,19 +104,6 @@ export default class EntryAbility extends UIAbility {
         return;
       }
       hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? '');
-      try {
-        let windowClass: window.Window = windowStage.getMainWindowSync();
-        let isLayoutFullScreen = true;
-        windowClass.setWindowLayoutFullScreen(isLayoutFullScreen).then(() => {
-          hilog.info(0x0000, 'testTag', '%{public}s', 'Succeeded in setting the window layout to full-screen mode.');
-        }).catch((err: BusinessError) => {
-          hilog.error(0x0000, 'testTag',
-            `Failed to set the window layout to full-screen mode, err code: ${err.code}, message: ${err.message}}`);
-        });
-      } catch (error) {
-        hilog.error(0x0000, 'testTag', '%{public}s',
-          `onWindowStageCreate failed. Cause code: ${error.code}, message: ${error.message}`);
-      }
     });
   }