diff --git a/src/editor/lib/EditorControls.js b/src/editor/lib/EditorControls.js
index 608f7f34..ac880130 100644
--- a/src/editor/lib/EditorControls.js
+++ b/src/editor/lib/EditorControls.js
@@ -96,7 +96,6 @@ THREE.EditorControls = function (_object, domElement) {
     scope.transitionSpeed = 0.001;
     scope.transitionProgress = 0;
     scope.transitioning = true;
-    // The changeEvent is emitted at the end of the transition below
   };
 
   function easeInOutQuad(t) {
@@ -138,8 +137,8 @@ THREE.EditorControls = function (_object, domElement) {
           this.transitioning = false;
           object.position.copy(this.transitionCamPosEnd);
           object.quaternion.copy(this.transitionCamQuaternionEnd);
-          scope.dispatchEvent(changeEvent);
         }
+        scope.dispatchEvent(changeEvent);
       }
     }
   };
diff --git a/src/editor/lib/viewport.js b/src/editor/lib/viewport.js
index c6f4e8e7..e32e96e3 100644
--- a/src/editor/lib/viewport.js
+++ b/src/editor/lib/viewport.js
@@ -213,6 +213,7 @@ export function Viewport(inspector) {
   controls.zoomSpeed = 0.05;
   controls.setAspectRatio(sceneEl.canvas.width / sceneEl.canvas.height);
   controls.addEventListener('change', () => {
+    transformControls.update(true); // true is updateScale
     Events.emit('camerachanged');
   });
 
@@ -291,7 +292,6 @@ export function Viewport(inspector) {
 
   Events.on('objectfocus', (object) => {
     controls.focus(object);
-    transformControls.update();
   });
 
   Events.on('geometrychanged', (object) => {