diff --git a/apps/client/src/widgets/dialogs/revisions.css b/apps/client/src/widgets/dialogs/revisions.css
index ca938047c2..0985839c04 100644
--- a/apps/client/src/widgets/dialogs/revisions.css
+++ b/apps/client/src/widgets/dialogs/revisions.css
@@ -25,7 +25,7 @@ body.desktop .revisions-dialog {
         width: 300px;
     }
 
-    .modal-content {
+    .modal-content-with-sidebar {
         height: 80vh;
     }
 }
@@ -85,7 +85,9 @@ body.desktop .revisions-dialog {
         padding: 20px;
     }
 
-
+    .no-items {
+        padding-block: 3em;
+    }
 
     .revision-list {
         flex: 1 1 0;
diff --git a/apps/client/src/widgets/dialogs/revisions.tsx b/apps/client/src/widgets/dialogs/revisions.tsx
index 2fddb65ac3..e9f67d88f5 100644
--- a/apps/client/src/widgets/dialogs/revisions.tsx
+++ b/apps/client/src/widgets/dialogs/revisions.tsx
@@ -27,6 +27,7 @@ import FormList, { FormDropdownDivider, FormListItem } from "../react/FormList";
 import FormToggle from "../react/FormToggle";
 import { useTriliumEvent } from "../react/hooks";
 import Modal from "../react/Modal";
+import NoItems from "../react/NoItems";
 import { RawHtmlBlock } from "../react/RawHtml";
 import PdfViewer from "../type_widgets/file/PdfViewer";
 
@@ -57,10 +58,49 @@ export default function RevisionsDialog() {
         }
     }, [ note, refreshCounter ]);
 
+    const hasRevisions = !!revisions?.length;
+
     if (revisions?.length && !currentRevision) {
         setCurrentRevision(revisions[0]);
     }
 
+    const onHidden = () => {
+        setShown(false);
+        setShowDiff(true);
+        setNote(undefined);
+        setCurrentRevision(undefined);
+        setRevisions(undefined);
+    };
+
+    if (!hasRevisions) {
+        return (
+            <Modal
+                className="revisions-dialog"
+                size="md"
+                title={t("revisions.note_revisions")}
+                helpPageId="vZWERwf8U3nx"
+                header={note && (
+                    <RevisionsMenu
+                        note={note}
+                        onRevisionSaved={() => {
+                            setRefreshCounter(c => c + 1);
+                            setCurrentRevision(undefined);
+                        }}
+                        onAllDeleted={() => {
+                            setRevisions([]);
+                            setCurrentRevision(undefined);
+                        }}
+                        hasRevisions={false}
+                    />
+                )}
+                onHidden={onHidden}
+                show={shown}
+            >
+                <NoItems icon="bx bx-history" text={t("revisions.no_revisions")} />
+            </Modal>
+        );
+    }
+
     return (
         <Modal
             className="revisions-dialog"
@@ -78,7 +118,7 @@ export default function RevisionsDialog() {
                         setRevisions([]);
                         setCurrentRevision(undefined);
                     }}
-                    hasRevisions={!!revisions?.length}
+                    hasRevisions={true}
                 />
             )}
             sidebar={
@@ -93,13 +133,7 @@ export default function RevisionsDialog() {
                     currentRevision={currentRevision}
                 />
             }
-            onHidden={() => {
-                setShown(false);
-                setShowDiff(false);
-                setNote(undefined);
-                setCurrentRevision(undefined);
-                setRevisions(undefined);
-            }}
+            onHidden={onHidden}
             show={shown}
         >
             <RevisionToolbar
@@ -407,7 +441,7 @@ function RevisionPreview({noteContent, revisionItem, showDiff }: {
             className={clsx("revision-content use-tn-links selectable-text", `type-${revisionItem?.type}`)}
             style={{ wordBreak: "break-word" }}
         >
-            <h3 className="revision-title">{revisionItem?.title ?? t("revisions.no_revisions")}</h3>
+            <h3 className="revision-title">{revisionItem?.title}</h3>
             <RevisionContent noteContent={noteContent} revisionItem={revisionItem} fullRevision={fullRevision} showDiff={showDiff}/>
         </div>
     );