{closeButtonLocation === "left" && renderCloseButton()}
{renderBackButton()}
diff --git a/extensions/plugin-basic-ui/src/components/AppScreen.css.ts b/extensions/plugin-basic-ui/src/components/AppScreen.css.ts
index 293243c13..746729bcd 100644
--- a/extensions/plugin-basic-ui/src/components/AppScreen.css.ts
+++ b/extensions/plugin-basic-ui/src/components/AppScreen.css.ts
@@ -172,7 +172,16 @@ export const paper = recipe({
export const paperContent = recipe({
base: [
f.posAbsFull,
+ f.borderBox,
{
+ paddingLeft: [
+ "constant(safe-area-inset-left)",
+ "env(safe-area-inset-left, 0px)",
+ ],
+ paddingRight: [
+ "constant(safe-area-inset-right)",
+ "env(safe-area-inset-right, 0px)",
+ ],
overflowY: "scroll",
WebkitOverflowScrolling: "touch",
"::-webkit-scrollbar": {