diff --git a/apps/client/src/stylesheets/style.css b/apps/client/src/stylesheets/style.css
index 9ef1c5e2d..36805a3d4 100644
--- a/apps/client/src/stylesheets/style.css
+++ b/apps/client/src/stylesheets/style.css
@@ -2591,7 +2591,7 @@ iframe.print-iframe {
     flex-direction: column;
 }
 
-.scrolling-container > .note-detail.full-height,
+.note-detail.full-height,
 .scrolling-container > .note-list-widget.full-height {
     position: relative;
     flex-grow: 1;
diff --git a/apps/client/src/widgets/dialogs/PopupEditor.css b/apps/client/src/widgets/dialogs/PopupEditor.css
index ce6494f33..325d9ea47 100644
--- a/apps/client/src/widgets/dialogs/PopupEditor.css
+++ b/apps/client/src/widgets/dialogs/PopupEditor.css
@@ -25,6 +25,8 @@ body.desktop .modal.popup-editor-dialog .modal-dialog {
     padding: 0;
     height: 75vh;
     overflow: auto;
+    display: flex;
+    flex-direction: column;
 }
 
 .modal.popup-editor-dialog .note-detail-editable-text {
diff --git a/apps/client/src/widgets/dialogs/PopupEditor.tsx b/apps/client/src/widgets/dialogs/PopupEditor.tsx
index 6b305fbb2..d28e7d6d8 100644
--- a/apps/client/src/widgets/dialogs/PopupEditor.tsx
+++ b/apps/client/src/widgets/dialogs/PopupEditor.tsx
@@ -6,6 +6,7 @@ import NoteTitleWidget from "../note_title";
 import NoteIcon from "../note_icon";
 import NoteContext from "../../components/note_context";
 import { ParentComponent } from "../react/react_utils";
+import NoteDetail from "../NoteDetail";
 
 const noteContext = new NoteContext("_popup-editor");
 
@@ -31,18 +32,22 @@ export default function PopupEditor() {
 
     return (
         <Modal
-            title={(
-                <div className="title-row">
-                    <NoteIcon />
-                    <NoteTitleWidget />
-                </div>
-            )}
+            title={<TitleRow />}
             className="popup-editor-dialog"
             size="lg"
             show={shown}
             onHidden={() => setShown(false)}
         >
-            Body goes here
+            <NoteDetail />
         </Modal>
     )
 }
+
+export function TitleRow() {
+    return (
+        <div className="title-row">
+            <NoteIcon />
+            <NoteTitleWidget />
+        </div>
+    )
+}