diff --git a/apps/client/src/components/app_context.ts b/apps/client/src/components/app_context.ts
index 7bc544e7e..36d364049 100644
--- a/apps/client/src/components/app_context.ts
+++ b/apps/client/src/components/app_context.ts
@@ -499,6 +499,10 @@ type EventMappings = {
         noteIds: string[];
     };
     refreshData: { ntxId: string | null | undefined };
+    contentSafeMarginChanged: {
+        top: number;
+        noteContext: NoteContext;
+    }
 };
 
 export type EventListener<T extends EventNames> = {
diff --git a/apps/client/src/layouts/desktop_layout.tsx b/apps/client/src/layouts/desktop_layout.tsx
index e26664bf9..4fa5fe209 100644
--- a/apps/client/src/layouts/desktop_layout.tsx
+++ b/apps/client/src/layouts/desktop_layout.tsx
@@ -3,6 +3,7 @@ import { DESKTOP_FLOATING_BUTTONS } from "../widgets/FloatingButtonsDefinitions.
 import ApiLog from "../widgets/api_log.jsx";
 import ClosePaneButton from "../widgets/buttons/close_pane_button.js";
 import CloseZenModeButton from "../widgets/close_zen_button.jsx";
+import ContentHeader from "../widgets/content-header.js";
 import CreatePaneButton from "../widgets/buttons/create_pane_button.js";
 import FindWidget from "../widgets/find.js";
 import FlexContainer from "../widgets/containers/flex_container.js";
@@ -131,13 +132,14 @@ export default class DesktopLayout {
                                                         )
                                                         .child(<Ribbon />)
                                                         .child(<SharedInfo />)
-                                                        .child(<ReadOnlyNoteInfoBar />)
                                                         .child(new WatchedFileUpdateStatusWidget())
                                                         .child(<FloatingButtons items={DESKTOP_FLOATING_BUTTONS} />)
                                                         .child(
                                                             new ScrollingContainer()
                                                                 .filling()
-                                                                .child(<ReadOnlyNoteInfoBar zenModeOnly />)
+                                                                .child(new ContentHeader()
+                                                                    .child(<ReadOnlyNoteInfoBar />)
+                                                                )
                                                                 .child(new PromotedAttributesWidget())
                                                                 .child(<SqlTableSchemas />)
                                                                 .child(new NoteDetailWidget())
diff --git a/apps/client/src/layouts/mobile_layout.tsx b/apps/client/src/layouts/mobile_layout.tsx
index 517d50e36..445df3922 100644
--- a/apps/client/src/layouts/mobile_layout.tsx
+++ b/apps/client/src/layouts/mobile_layout.tsx
@@ -28,6 +28,7 @@ import StandaloneRibbonAdapter from "../widgets/ribbon/components/StandaloneRibb
 import TabRowWidget from "../widgets/tab_row.js";
 import ToggleSidebarButton from "../widgets/mobile_widgets/toggle_sidebar_button.jsx";
 import type AppContext from "../components/app_context.js";
+import ContentHeader from "../widgets/content-header.js";
 
 const MOBILE_CSS = `
 <style>
@@ -151,14 +152,15 @@ export default class MobileLayout {
                                             .child(<MobileDetailMenu />)
                                     )
                                     .child(<SharedInfoWidget />)
-                                    .child(<ReadOnlyNoteInfoBar />)
                                     .child(<FloatingButtons items={MOBILE_FLOATING_BUTTONS} />)
-                                    .child(<ReadOnlyNoteInfoBar zenModeOnly />)
                                     .child(new PromotedAttributesWidget())
                                     .child(
                                         new ScrollingContainer()
                                             .filling()
                                             .contentSized()
+                                            .child(new ContentHeader()
+                                                .child(<ReadOnlyNoteInfoBar />)
+                                            )
                                             .child(new NoteDetailWidget())
                                             .child(<NoteList media="screen" />)
                                             .child(<StandaloneRibbonAdapter component={SearchDefinitionTab} />)
diff --git a/apps/client/src/widgets/FloatingButtons.tsx b/apps/client/src/widgets/FloatingButtons.tsx
index 42d5ee349..f38039afd 100644
--- a/apps/client/src/widgets/FloatingButtons.tsx
+++ b/apps/client/src/widgets/FloatingButtons.tsx
@@ -1,6 +1,6 @@
 import { t } from "i18next";
 import "./FloatingButtons.css";
-import { useNoteContext, useNoteLabel, useNoteLabelBoolean } from "./react/hooks";
+import { useNoteContext, useNoteLabel, useNoteLabelBoolean, useTriliumEvent } from "./react/hooks";
 import { useContext, useEffect, useMemo, useState } from "preact/hooks";
 import { ParentComponent } from "./react/react_utils";
 import { EventData, EventNames } from "../components/app_context";
@@ -20,6 +20,7 @@ interface FloatingButtonsProps {
  * properly handle rounded corners, as defined by the --border-radius CSS variable.
  */
 export default function FloatingButtons({ items }: FloatingButtonsProps) {
+    const [ top, setTop ] = useState(0);
     const { note, noteContext } = useNoteContext();
     const parentComponent = useContext(ParentComponent);
     const [ viewType ] = useNoteLabel(note, "viewType");
@@ -47,8 +48,14 @@ export default function FloatingButtons({ items }: FloatingButtonsProps) {
     const [ visible, setVisible ] = useState(true);
     useEffect(() => setVisible(true), [ note ]);
 
+    useTriliumEvent("contentSafeMarginChanged", (e) => {
+        if (e.noteContext === noteContext) {
+            setTop(e.top);
+        }
+    });
+
     return (
-        <div className="floating-buttons no-print">
+        <div className="floating-buttons no-print" style={{top}}>
             <div className={`floating-buttons-children ${!visible ? "temporarily-hidden" : ""}`}>
                 {context && items.map((Component) => (
                     <Component {...context} />
diff --git a/apps/client/src/widgets/content-header.ts b/apps/client/src/widgets/content-header.ts
new file mode 100644
index 000000000..64d57ec42
--- /dev/null
+++ b/apps/client/src/widgets/content-header.ts
@@ -0,0 +1,63 @@
+import { EventData } from "../components/app_context";
+import BasicWidget from "./basic_widget";
+import Container from "./containers/container";
+import NoteContext from "../components/note_context";
+
+export default class ContentHeader extends Container<BasicWidget> {
+    
+    noteContext?: NoteContext;
+    thisElement?: HTMLElement;
+    parentElement?: HTMLElement;
+    resizeObserver: ResizeObserver;
+    currentHeight: number = 0;
+    currentSafeMargin: number = NaN;
+
+    constructor() {
+        super();
+
+        this.css("contain", "unset");
+        this.resizeObserver = new ResizeObserver(this.onResize.bind(this));
+    }
+
+    setNoteContextEvent({ noteContext }: EventData<"setNoteContext">) {
+        this.noteContext = noteContext;
+        this.init();
+    }
+
+    init() {
+        this.parentElement = this.parent!.$widget.get(0);
+
+        if (!this.parentElement) {
+            console.warn("No parent set for <ContentHeader>.");
+            return;
+        }
+
+        this.thisElement = this.$widget.get(0)!;
+
+        this.resizeObserver.observe(this.thisElement);
+        this.parentElement.addEventListener("scroll", this.updateSafeMargin.bind(this));
+    }
+
+    updateSafeMargin() {
+        const newSafeMargin = Math.max(this.currentHeight - this.parentElement!.scrollTop, 0);
+
+        if (newSafeMargin !== this.currentSafeMargin) {
+            this.currentSafeMargin = newSafeMargin;
+
+            this.triggerEvent("contentSafeMarginChanged", {
+                top: newSafeMargin,
+                noteContext: this.noteContext!
+            });
+        }
+    }
+
+    onResize(entries: ResizeObserverEntry[]) {
+        for (const entry of entries) {
+            if (entry.target === this.thisElement) {
+                this.currentHeight = entry.contentRect.height;
+                this.updateSafeMargin();
+            }
+        }
+    }
+
+}
\ No newline at end of file