diff --git a/index.html b/index.html
index 2b6340a9..4207021d 100644
--- a/index.html
+++ b/index.html
@@ -1114,13 +1114,12 @@ <h2 id="modal-title" data-i18n="about_heading" style="margin-top: 0;">About Floc
                 alt="bounds"
               />
           </button-->
-            <!--button class="gizmo-button" id="focusButton" disabled>
+            <button class="gizmo-button" id="focusButton" disabled>
               <img
                 src="images/focus.svg"
                 width="20px"
                 height="20px"
-                alt="focus"
-              /-->
+                alt="focus"/>
             </button>
             <button class="gizmo-button" id="hideButton" data-i18n="hide_button" disabled aria-label="Select object" title="Select object">
               <!-- <img
diff --git a/ui/gizmos.js b/ui/gizmos.js
index fa6e09ee..2c779f72 100644
--- a/ui/gizmos.js
+++ b/ui/gizmos.js
@@ -432,6 +432,24 @@ function resetBoundingBoxVisibilityIfManuallyChanged(mesh) {
   if (mesh && mesh.visibility === 0.001) mesh.visibility = 0;
 }
 
+function showBoundingBox(mesh, focusMode = false) {
+  if (mesh.parent) {
+    mesh = getRootMesh(mesh.parent);
+    mesh.visibility = 0.001;
+  } else if (focusMode && !mesh.visibility) {
+    // Set mesh visibility even if mesh has no parent
+    // focusMode is only used when camera focused on mesh
+
+    /* With this, non-composite meshes can still have their
+    visibility set to 0.001. However, this will not be a big
+    issue here as, even in past testing, non-composite meshes
+    still were not showing, so this may even be preferred. */
+
+    mesh.visibility = 0.001;
+  }
+  mesh.showBoundingBox = true;
+}
+
 function hideBoundingBox(mesh) {
   mesh.showBoundingBox = false;
 }
@@ -546,6 +564,14 @@ function focusCameraOnMesh() {
   const newTarget = boundingInfo.boundingBox.centerWorld; // Center of the new mesh
   const camera = flock.scene.activeCamera;
 
+  let selectFocusedMesh = () => {
+    // "Select" the focused mesh
+    window.currentMesh = mesh;
+    gizmoManager.selectGizmoEnabled = true;
+    gizmoManager.attachToMesh(mesh); // Unfortunately needed to ensure bounding box gets hidden 
+    showBoundingBox(mesh, true);
+  }
+
   if (camera.metadata && camera.metadata.following) {
     const player = camera.metadata.following; // The player (mesh) the camera is following
     const playerDistance = 5; // Fixed distance between player and target
@@ -596,11 +622,13 @@ function focusCameraOnMesh() {
     camera.position = newCameraPosition;
     camera.setTarget(newTarget);
   }
+  selectFocusedMesh();
 }
 
 export function disableGizmos() {
   if (!gizmoManager) return;
   // Disable all gizmos
+  gizmoManager.selectGizmoEnabled = false;
   gizmoManager.positionGizmoEnabled = false;
   gizmoManager.rotationGizmoEnabled = false;
   gizmoManager.scaleGizmoEnabled = false;
@@ -801,7 +829,7 @@ export function toggleGizmo(gizmoType) {
             gizmoManager.attachToMesh(pickedMesh);
 
             // Show bounding box for the selected mesh
-            pickedMesh.showBoundingBox = true;
+            showBoundingBox(pickedMesh);
           } else {
             if (pickedMesh && pickedMesh.name === "ground") {
               const position = event.pickInfo.pickedPoint;
@@ -1461,10 +1489,7 @@ function turnOffAllGizmos() {
   resetBoundingBoxVisibilityIfManuallyChanged(gizmoManager.attachedMesh);
   resetAttachedMeshIfMeshAttached();
   gizmoManager.attachToMesh(null);
-  gizmoManager.positionGizmoEnabled = false;
-  gizmoManager.rotationGizmoEnabled = false;
-  gizmoManager.scaleGizmoEnabled = false;
-  gizmoManager.boundingBoxGizmoEnabled = false;
+  disableGizmos();
 }
 
 // Track DO sections and their associated blocks for cleanup
@@ -1526,6 +1551,7 @@ export function enableGizmos() {
   // Initialize undo handler for DO section cleanup
   addUndoHandler();
 
+  const focusButton = document.getElementById("focusButton");
   const positionButton = document.getElementById("positionButton");
   const rotationButton = document.getElementById("rotationButton");
   const scaleButton = document.getElementById("scaleButton");
@@ -1559,6 +1585,7 @@ export function enableGizmos() {
   // Enable the buttons
 
   const buttons = [
+    focusButton,
     positionButton,
     rotationButton,
     scaleButton,
@@ -1580,6 +1607,7 @@ export function enableGizmos() {
   buttons.forEach((button) => button.removeAttribute("disabled"));
 
   // Attach event listeners
+  focusButton.addEventListener("click", () => toggleGizmo("focus"));
   positionButton.addEventListener("click", () => toggleGizmo("position"));
   rotationButton.addEventListener("click", () => toggleGizmo("rotation"));
   scaleButton.addEventListener("click", () => toggleGizmo("scale"));