diff --git a/index.html b/index.html
index 3c59152c..6b6a5628 100644
--- a/index.html
+++ b/index.html
@@ -1136,13 +1136,13 @@ <h2 id="modal-title" data-i18n="about_heading" style="margin-top: 0;">About Floc
                 alt="bounds"
               />
           </button-->
-            <!--button class="gizmo-button" id="focusButton" disabled>
-              <img
+            <button class="gizmo-button" id="focusButton" disabled>
+              <!-- <img
                 src="images/focus.svg"
                 width="20px"
                 height="20px"
-                alt="focus"
-              /-->
+                alt="focus"/> -->
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path fill="white" d="M288 32c-80.8 0-145.5 36.8-192.6 80.6C48.6 156 17.3 208 2.5 243.7c-3.3 7.9-3.3 16.7 0 24.6C17.3 304 48.6 356 95.4 399.4C142.5 443.2 207.2 480 288 480s145.5-36.8 192.6-80.6c46.8-43.5 78.1-95.4 93-131.1c3.3-7.9 3.3-16.7 0-24.6c-14.9-35.7-46.2-87.7-93-131.1C433.5 68.8 368.8 32 288 32zM144 256a144 144 0 1 1 288 0 144 144 0 1 1 -288 0zm144-64c0 35.3-28.7 64-64 64c-7.1 0-13.9-1.2-20.3-3.3c-5.5-1.8-11.9 1.6-11.7 7.4c.3 6.9 1.3 13.8 3.2 20.7c13.7 51.2 66.4 81.6 117.6 67.9s81.6-66.4 67.9-117.6c-11.1-41.5-47.8-69.4-88.6-71.1c-5.8-.2-9.2 6.1-7.4 11.7c2.1 6.4 3.3 13.2 3.3 20.3z"/></svg>
             </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 5cab2881..8da5b993 100644
--- a/ui/gizmos.js
+++ b/ui/gizmos.js
@@ -353,6 +353,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;
 }
@@ -455,6 +473,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
@@ -505,11 +531,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;
@@ -665,7 +693,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;
@@ -1166,10 +1194,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
@@ -1231,6 +1256,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");
@@ -1264,6 +1290,7 @@ export function enableGizmos() {
   // Enable the buttons
 
   const buttons = [
+    focusButton,
     positionButton,
     rotationButton,
     scaleButton,
@@ -1285,6 +1312,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"));