diff --git a/packages/frontend/src/main/components/viewer/CommentAddOverlay.vue b/packages/frontend/src/main/components/viewer/CommentAddOverlay.vue
index d9a46393a..5ce4d6431 100644
--- a/packages/frontend/src/main/components/viewer/CommentAddOverlay.vue
+++ b/packages/frontend/src/main/components/viewer/CommentAddOverlay.vue
@@ -164,6 +164,7 @@ export default {
       this.expand = false
       this.visible = false
       this.commentText = null
+      this.$store.commit('setAddingCommentState', { addingCommentState: false })
       window.__viewer.interactions.deselectObjects()
     },
     sendStatusUpdate() {
@@ -188,6 +189,7 @@ export default {
         // TODO: deselect event
         this.visible = false
         this.location = null
+        this.$store.commit('setAddingCommentState', { addingCommentState: false })
         return
       }
 
diff --git a/packages/frontend/src/main/components/viewer/ViewerControls.vue b/packages/frontend/src/main/components/viewer/ViewerControls.vue
index 74b4b8b7c..e250075f1 100644
--- a/packages/frontend/src/main/components/viewer/ViewerControls.vue
+++ b/packages/frontend/src/main/components/viewer/ViewerControls.vue
@@ -1,6 +1,10 @@
 <template>
   <div>
-    <v-card class="elevation-5 rounded-xl pl-3 py-0 d-flex align-center" height="44">
+    <v-card
+      class="elevation-5 rounded-xl pl-3 py-0 d-flex align-center"
+      height="44"
+      style="max-width: 100vw; overflow-x: scroll"
+    >
       <v-btn
         v-show="showVisReset"
         v-tooltip="`Resets all applied filters`"