diff --git a/src/components/ChapterVoteComponent.tsx b/src/components/ChapterVoteComponent.tsx
index 6b9049a8..4893739e 100644
--- a/src/components/ChapterVoteComponent.tsx
+++ b/src/components/ChapterVoteComponent.tsx
@@ -32,6 +32,11 @@ class ChapterVoteComponent extends React.Component<ChapterVoteProps, ChapterVote
     }
 
     render(): React.ReactElement {
+        if (this.tooltip && !this.state.show) {
+            this.tooltip.close();
+            this.tooltip = null;
+        }
+
         return (
             <>
                 {/* Upvote Button */}
diff --git a/src/js-components/previewBar.ts b/src/js-components/previewBar.ts
index 1b9df1c8..7e171e4e 100644
--- a/src/js-components/previewBar.ts
+++ b/src/js-components/previewBar.ts
@@ -685,6 +685,7 @@ class PreviewBar {
             } else {
                 // Hide chapters menu again
                 chaptersContainer.style.display = "none";
+                this.chapterVote.setVisibility(false);
             }
         }
     }