diff --git a/app/assets/javascripts/components/AutocompleteTagInput.tsx b/app/assets/javascripts/components/AutocompleteTagInput.tsx
index 549674b51..4fbfab6a0 100644
--- a/app/assets/javascripts/components/AutocompleteTagInput.tsx
+++ b/app/assets/javascripts/components/AutocompleteTagInput.tsx
@@ -16,7 +16,7 @@ export const AutocompleteTagInput: FunctionalComponent<Props> = ({
   application,
   appState,
 }) => {
-  const { tagElements } = appState.activeNote;
+  const { tagElements, tags } = appState.activeNote;
 
   const [searchQuery, setSearchQuery] = useState('');
   const [dropdownVisible, setDropdownVisible] = useState(false);
@@ -89,7 +89,7 @@ export const AutocompleteTagInput: FunctionalComponent<Props> = ({
   }, [tagResults, searchQuery]);
 
   return (
-    <form onSubmit={onFormSubmit} className="mt-2">
+    <form onSubmit={onFormSubmit} className={`${tags.length > 0 ? 'mt-2' : ''}`}>
       <Disclosure open={dropdownVisible} onChange={showDropdown}>
         <input
           ref={inputRef}
diff --git a/app/assets/javascripts/views/editor/editor-view.pug b/app/assets/javascripts/views/editor/editor-view.pug
index aa94ead28..9cb2f8e4c 100644
--- a/app/assets/javascripts/views/editor/editor-view.pug
+++ b/app/assets/javascripts/views/editor/editor-view.pug
@@ -27,7 +27,7 @@
     #editor-title-bar.section-title-bar.w-full(
       ng-show='self.note && !self.note.errorDecrypting'
       )
-      div.flex.items-start.justify-between
+      div.flex.items-start.justify-between.h-8
         div.flex-grow(
           ng-class="{'locked' : self.noteLocked}"
         )