diff --git a/webapp/packages/core-blocks/src/Overlay/OVERLAY_BASE_STYLES.ts b/webapp/packages/core-blocks/src/Overlay/OVERLAY_BASE_STYLES.ts
index a1d9c42a2d..c865160cd0 100644
--- a/webapp/packages/core-blocks/src/Overlay/OVERLAY_BASE_STYLES.ts
+++ b/webapp/packages/core-blocks/src/Overlay/OVERLAY_BASE_STYLES.ts
@@ -18,9 +18,13 @@ export const OVERLAY_BASE_STYLES = css`
       height: 100%;
       background-color: rgba(0, 0, 0, 0.4);
 
-      [|active=false] {
+      &:not([|active]) {
         display: none;
       }
+      
+      &[|fill] {
+        background-color: var(--theme-background-surface);
+      }
     }
   
     overlay {
@@ -43,6 +47,10 @@ export const OVERLAY_BASE_STYLES = css`
       max-height: calc(100% - 48px);
     }
 
+    overlay[|fill] box {
+      box-shadow: none;
+    }
+
     actions {
       gap: 16px;
       display: flex;
@@ -54,10 +62,13 @@ export const OVERLAY_BASE_STYLES = css`
     }
 
     message {
-      padding-top: 0px;
       padding-right: 0px;
       overflow: auto;
       flex: 1;
+
+      &:not(:first-child) {
+        padding-top: 0px;
+      }
     }
 
     message-box {
diff --git a/webapp/packages/core-blocks/src/Overlay/Overlay.tsx b/webapp/packages/core-blocks/src/Overlay/Overlay.tsx
index 58844350fc..cf3c78c180 100644
--- a/webapp/packages/core-blocks/src/Overlay/Overlay.tsx
+++ b/webapp/packages/core-blocks/src/Overlay/Overlay.tsx
@@ -15,11 +15,13 @@ import { OVERLAY_BASE_STYLES } from './OVERLAY_BASE_STYLES';
 
 interface Props {
   active?: boolean;
+  fill?: boolean;
   className?: string;
 }
 
 export const Overlay = observer<Props>(function Overlay({
   active,
+  fill,
   className,
   children,
 }) {
@@ -30,7 +32,7 @@ export const Overlay = observer<Props>(function Overlay({
   }
 
   return styled(styles)(
-    <overlay className={className} {...use({ active })}>
+    <overlay className={className} {...use({ active, fill })}>
       <box>
         {children}
       </box>
diff --git a/webapp/packages/core-blocks/src/useFocus.ts b/webapp/packages/core-blocks/src/useFocus.ts
index 5da6481333..78d506d78c 100644
--- a/webapp/packages/core-blocks/src/useFocus.ts
+++ b/webapp/packages/core-blocks/src/useFocus.ts
@@ -13,6 +13,7 @@ import { useObjectRef } from './useObjectRef';
 import { useObservableRef } from './useObservableRef';
 
 interface FocusOptions {
+  autofocus?: boolean;
   focusFirstChild?: boolean;
   onFocus?: () => void;
   onBlur?: () => void;
@@ -21,28 +22,40 @@ interface FocusOptions {
 interface IState<T extends HTMLElement> {
   focus: boolean;
   reference: T | null;
-  updateFocus: (ref: T | null) => void;
+  setRef: (ref: T | null) => void;
+  updateFocus: () => void;
   focusFirstChild: () => void;
 }
 
 export function useFocus<T extends HTMLElement>({
+  autofocus,
   focusFirstChild,
   onFocus,
   onBlur,
 }: FocusOptions): [(obj: T | null) => void, IState<T>] {
-  const handlersRef = useObjectRef({ onFocus, onBlur });
+  const optionsRef = useObjectRef({ autofocus, focusFirstChild, onFocus, onBlur });
   const state = useObservableRef<IState<T>>(
     () => ({
       reference: null,
       focus: false,
-      updateFocus(ref: T | null) {
+      setRef(ref: T | null) {
         if (this.reference !== ref) {
           this.reference = ref;
+
+          this.updateFocus();
+        }
+      },
+      updateFocus() {
+        if (this.reference) {
+          if (optionsRef.autofocus) {
+            this.reference.focus();
+          }
+
           this.focusFirstChild();
         }
       },
       focusFirstChild() {
-        if (this.reference !== null && focusFirstChild) {
+        if (this.reference !== null && optionsRef.focusFirstChild) {
           const firstFocusable = this.reference
             .querySelectorAll<T>(`
             button:not([disabled=disabled]), 
@@ -71,6 +84,7 @@ export function useFocus<T extends HTMLElement>({
     {
       focus: observable.ref,
       reference: observable.ref,
+      setRef: action.bound,
       updateFocus: action.bound,
     },
     false,
@@ -86,16 +100,16 @@ export function useFocus<T extends HTMLElement>({
     }
 
     const focusHandler = () => {
-      if (handlersRef.onFocus) {
-        handlersRef.onFocus();
+      if (optionsRef.onFocus) {
+        optionsRef.onFocus();
       }
 
       state.focus = true;
     };
 
     const blurHandler = () => {
-      if (handlersRef.onBlur) {
-        handlersRef.onBlur();
+      if (optionsRef.onBlur) {
+        optionsRef.onBlur();
       }
 
       state.focus = false;
@@ -110,5 +124,5 @@ export function useFocus<T extends HTMLElement>({
     };
   }, [state.reference]);
 
-  return [state.updateFocus, state];
+  return [state.setRef, state];
 }