diff --git a/app/pages/PageEnigma/js/editor.ts b/app/pages/PageEnigma/js/editor.ts
index 4471fbddf2..e3651cd5b8 100644
--- a/app/pages/PageEnigma/js/editor.ts
+++ b/app/pages/PageEnigma/js/editor.ts
@@ -150,7 +150,6 @@ class Editor {
     this.raycaster;
     this.mouse;
     this.selected;
-
     this.last_selected;
     this.transform_interaction;
     this.rendering = false;
@@ -861,18 +860,25 @@ class Editor {
           this.camera.position.copy(this.cam_obj.position);
           this.camera.rotation.copy(this.cam_obj.rotation);
         }
+
+        this.cam_obj.visible = false;
       }
     }
+    else if (this.cam_obj){
+      this.cam_obj.visible = true;
+    }
 
     if (this.render_camera && this.cam_obj) {
       this.render_camera.position.copy(this.cam_obj.position);
       this.render_camera.rotation.copy(this.cam_obj.rotation);
+      this.cam_obj.scale.copy(new THREE.Vector3(1,1,1));
     }
-
-    this.updateSelectedUI();
-
+    
     if(this.timeline.is_playing){
       this.timeline.update();
+    } 
+    else if (this.last_scrub == this.timeline.scrubber_frame_position){
+      this.updateSelectedUI();
     }
 
     this.last_scrub = this.timeline.scrubber_frame_position;