diff --git a/src/status_im/contexts/profile/edit/modal/style.cljs b/src/status_im/contexts/profile/edit/modal/style.cljs
index 6bdf51d993c..48a647de5dd 100644
--- a/src/status_im/contexts/profile/edit/modal/style.cljs
+++ b/src/status_im/contexts/profile/edit/modal/style.cljs
@@ -29,12 +29,7 @@
          (when platform/android? {:padding-bottom 12})))
 
 (def page-container
-  {:position :absolute
-   :top      0
-   :bottom   0
-   :left     0
-   :right    0
-   :z-index  100})
+  {:flex 1})
 
 (def info-message
   {:margin-top 8})
diff --git a/src/status_im/contexts/profile/edit/modal/view.cljs b/src/status_im/contexts/profile/edit/modal/view.cljs
index 18ecb910165..5c16f34546b 100644
--- a/src/status_im/contexts/profile/edit/modal/view.cljs
+++ b/src/status_im/contexts/profile/edit/modal/view.cljs
@@ -238,28 +238,29 @@
                                :new-name?    (and (not= initial-display-name @display-name)
                                                   (seq @display-name))
                                :valid-name?  valid-name?}))]
-        [rn/view {:style style/page-container}
-         [quo/page-nav
-          {:margin-top top
-           :background :blur
-           :icon-name  :i/close
-           :on-press   on-close}]
-         [content
-          {:profile-image        @profile-image
-           :custom-color         @custom-color
-           :display-name         @display-name
-           :validation-msg       @validation-msg
-           :valid-name?          valid-name?
-           :name-too-short?      name-too-short?
-           :picture-picker       picture-picker
-           :initial-display-name initial-display-name
-           :set-scroll           set-scroll
-           :set-scroll-height    set-scroll-height
-           :set-custom-color     set-custom-color
-           :set-display-name     set-display-name
-           :set-validation-msg   set-validation-msg}]
-         [floating-button
-          {:custom-color @custom-color
-           :scroll-y     @scroll-y
-           :on-submit    update-profile
-           :disabled?    disabled?}]]))))
+        [quo/overlay {:type :shell}
+         [rn/view {:style style/page-container}
+          [quo/page-nav
+           {:margin-top top
+            :background :blur
+            :icon-name  :i/close
+            :on-press   on-close}]
+          [content
+           {:profile-image        @profile-image
+            :custom-color         @custom-color
+            :display-name         @display-name
+            :validation-msg       @validation-msg
+            :valid-name?          valid-name?
+            :name-too-short?      name-too-short?
+            :picture-picker       picture-picker
+            :initial-display-name initial-display-name
+            :set-scroll           set-scroll
+            :set-scroll-height    set-scroll-height
+            :set-custom-color     set-custom-color
+            :set-display-name     set-display-name
+            :set-validation-msg   set-validation-msg}]
+          [floating-button
+           {:custom-color @custom-color
+            :scroll-y     @scroll-y
+            :on-submit    update-profile
+            :disabled?    disabled?}]]]))))
diff --git a/src/status_im/navigation/screens.cljs b/src/status_im/navigation/screens.cljs
index a4b8f519744..a5011cb4132 100644
--- a/src/status_im/navigation/screens.cljs
+++ b/src/status_im/navigation/screens.cljs
@@ -1060,8 +1060,8 @@
      :component profiles/view}
 
     {:name      :screen/profile.edit-profile-modal
-     :options   {:theme  :dark
-                 :layout options/onboarding-layout}
+     :metrics   {:track? true}
+     :options   options/transparent-screen-options
      :component edit-profile-modal/view}]
 
    [{:name    :shell