diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/dimension_container.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/dimension_container.tsx
index cd74119bbe315..9d71e74eff473 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/dimension_container.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/dimension_container.tsx
@@ -64,17 +64,20 @@ export function DimensionContainer({
   }, [handleClose]);
 
   useEffect(() => {
-    if (isOpen) {
-      document.body.classList.add('lnsBody--overflowHidden');
-    } else {
-      document.body.classList.remove('lnsBody--overflowHidden');
-    }
+    document.body.classList.toggle('lnsBody--overflowHidden', isOpen);
     return () => {
+      if (isOpen) {
+        setFocusTrapIsEnabled(false);
+      }
       document.body.classList.remove('lnsBody--overflowHidden');
     };
-  });
+  }, [isOpen]);
+
+  if (!isOpen) {
+    return null;
+  }
 
-  return isOpen ? (
+  return (
     <div ref={panelRef}>
       <EuiFocusTrap
         disabled={!focusTrapIsEnabled}
@@ -152,5 +155,5 @@ export function DimensionContainer({
         </div>
       </EuiFocusTrap>
     </div>
-  ) : null;
+  );
 }