diff --git a/app/assets/javascripts/components/NoteTags.tsx b/app/assets/javascripts/components/NoteTags.tsx
index 8720bffd6..5effdac7c 100644
--- a/app/assets/javascripts/components/NoteTags.tsx
+++ b/app/assets/javascripts/components/NoteTags.tsx
@@ -97,9 +97,11 @@ const NoteTags = observer(({ application, appState }: Props) => {
     if (tagsContainerExpanded || !lastVisibleTagIndex) {
       return;
     }
-    const { offsetLeft: lastVisibleTagLeft, clientWidth: lastVisibleTagWidth } =
+    if (tagsRef.current[lastVisibleTagIndex]) {
+      const { offsetLeft: lastVisibleTagLeft, clientWidth: lastVisibleTagWidth } =
       tagsRef.current[lastVisibleTagIndex];
-    setOverflowCountPosition(lastVisibleTagLeft + lastVisibleTagWidth);
+      setOverflowCountPosition(lastVisibleTagLeft + lastVisibleTagWidth);
+    }
   }, [lastVisibleTagIndex, tagsContainerExpanded]);
 
   const expandTags = () => {
@@ -142,7 +144,7 @@ const NoteTags = observer(({ application, appState }: Props) => {
         tagResizeObserver.disconnect();
       }
     };
-  }, [reloadTagsContainerLayout]);
+  }, [reloadTagsContainerLayout, tags]);
 
   const tagClass = `h-6 bg-contrast border-0 rounded text-xs color-text py-1 pr-2 flex items-center 
     mt-2 cursor-pointer hover:bg-secondary-contrast focus:bg-secondary-contrast`;
diff --git a/app/assets/javascripts/ui_models/app_state/active_note_state.ts b/app/assets/javascripts/ui_models/app_state/active_note_state.ts
index 2b8c10db8..f853f7fa6 100644
--- a/app/assets/javascripts/ui_models/app_state/active_note_state.ts
+++ b/app/assets/javascripts/ui_models/app_state/active_note_state.ts
@@ -14,7 +14,7 @@ import { AppState } from './app_state';
 
 export class ActiveNoteState {
   tags: SNTag[] = [];
-  tagsContainerMaxWidth: number | 'auto' = 'auto';
+  tagsContainerMaxWidth: number | 'auto' = 0;
   tagsContainerExpanded = false;
   overflowedTagsCount = 0;