diff --git a/packages/frontend-2/components/viewer/controls/Bottom.vue b/packages/frontend-2/components/viewer/controls/Bottom.vue
index 228f831f7..727ac3074 100644
--- a/packages/frontend-2/components/viewer/controls/Bottom.vue
+++ b/packages/frontend-2/components/viewer/controls/Bottom.vue
@@ -120,6 +120,10 @@ const toggleActivePanel = (panel: ActivePanel) => {
   if (panel === ActivePanel.sectionBox) {
     toggleSectionBox()
   }
+
+  if (panel === ActivePanel.measurements) {
+    enableMeasurements(true)
+  }
 }
 
 const toggleMeasurements = () => {
@@ -132,6 +136,9 @@ const onActivePanelClose = () => {
   if (activePanel.value === ActivePanel.sectionBox) {
     toggleSectionBox()
   }
+  if (activePanel.value === ActivePanel.measurements) {
+    enableMeasurements(false)
+  }
   activePanel.value = ActivePanel.none
 }