diff --git a/apps/client/src/widgets/ribbon/NoteActions.tsx b/apps/client/src/widgets/ribbon/NoteActions.tsx
index 6d2f46bda..487379f0d 100644
--- a/apps/client/src/widgets/ribbon/NoteActions.tsx
+++ b/apps/client/src/widgets/ribbon/NoteActions.tsx
@@ -32,7 +32,7 @@ export default function NoteActions() {
     const { note, ntxId, noteContext } = useNoteContext();
     return (
         <div className="ribbon-button-container" style={{ contain: "none" }}>
-            {note && <NoteActionsCustom note={note} ntxId={ntxId} />}
+            {note && ntxId && <NoteActionsCustom note={note} ntxId={ntxId} />}
             <MovePaneButton direction="left" />
             <MovePaneButton direction="right" />
             <ClosePaneButton />
diff --git a/apps/client/src/widgets/ribbon/style.css b/apps/client/src/widgets/ribbon/style.css
index f9dfa3b4d..bea93aa50 100644
--- a/apps/client/src/widgets/ribbon/style.css
+++ b/apps/client/src/widgets/ribbon/style.css
@@ -459,7 +459,10 @@ body.experimental-feature-new-layout {
             align-items: center;
             height: 36px;
             gap: var(--button-gap);
-            margin-right: 1em;
+
+            &> button:last-of-type {
+                margin-right: 1em;
+            }
         }
     }
 }