diff --git a/Source/Editor/Viewport/EditorViewport.cs b/Source/Editor/Viewport/EditorViewport.cs
index 0f9fce7c0..c16d3d9f5 100644
--- a/Source/Editor/Viewport/EditorViewport.cs
+++ b/Source/Editor/Viewport/EditorViewport.cs
@@ -535,7 +535,7 @@ namespace FlaxEditor.Viewport
 
             // Setup options
             {
-                Editor.Instance.Options.OptionsChanged += OnEditorOptionsChanged;
+                _editor.Options.OptionsChanged += OnEditorOptionsChanged;
                 SetupViewportOptions();
             }
 
@@ -581,7 +581,7 @@ namespace FlaxEditor.Viewport
 
                 // Camera Settings Menu
                 var cameraCM = new ContextMenu();
-                _cameraButton = new ViewportWidgetButton(string.Format(MovementSpeedTextFormat, _movementSpeed), Editor.Instance.Icons.Camera64, cameraCM, false, cameraSpeedTextWidth)
+                _cameraButton = new ViewportWidgetButton(string.Format(MovementSpeedTextFormat, _movementSpeed), _editor.Icons.Camera64, cameraCM, false, cameraSpeedTextWidth)
                 {
                     Tag = this,
                     TooltipText = "Camera Settings",
@@ -590,7 +590,7 @@ namespace FlaxEditor.Viewport
                 _cameraWidget.Parent = this;
 
                 // Orthographic/Perspective Mode Widget
-                _orthographicModeButton = new ViewportWidgetButton(string.Empty, Editor.Instance.Icons.CamSpeed32, null, true)
+                _orthographicModeButton = new ViewportWidgetButton(string.Empty, _editor.Icons.CamSpeed32, null, true)
                 {
                     Checked = !_isOrtho,
                     TooltipText = "Toggle Orthographic/Perspective Mode",
@@ -863,8 +863,8 @@ namespace FlaxEditor.Viewport
                         {
                         }
                     });
-                    viewLayers.AddButton("Reset layers", () => Task.ViewLayersMask = LayersMask.Default).Icon = Editor.Instance.Icons.Rotate32;
-                    viewLayers.AddButton("Disable layers", () => Task.ViewLayersMask = new LayersMask(0)).Icon = Editor.Instance.Icons.Rotate32;
+                    viewLayers.AddButton("Reset layers", () => Task.ViewLayersMask = LayersMask.Default).Icon = _editor.Icons.Rotate32;
+                    viewLayers.AddButton("Disable layers", () => Task.ViewLayersMask = new LayersMask(0));
                     viewLayers.AddSeparator();
                     var layers = LayersAndTagsSettings.GetCurrentLayers();
                     if (layers != null && layers.Length > 0)
@@ -904,8 +904,8 @@ namespace FlaxEditor.Viewport
                         {
                         }
                     });
-                    viewFlags.AddButton("Reset flags", () => Task.ViewFlags = ViewFlags.DefaultEditor).Icon = Editor.Instance.Icons.Rotate32;
-                    viewFlags.AddButton("Disable flags", () => Task.ViewFlags = ViewFlags.None).Icon = Editor.Instance.Icons.Rotate32;
+                    viewFlags.AddButton("Reset flags", () => Task.ViewFlags = ViewFlags.DefaultEditor).Icon = _editor.Icons.Rotate32;
+                    viewFlags.AddButton("Disable flags", () => Task.ViewFlags = ViewFlags.None);
                     viewFlags.AddSeparator();
                     for (int i = 0; i < ViewFlagsValues.Length; i++)
                     {
@@ -1085,7 +1085,7 @@ namespace FlaxEditor.Viewport
         /// </summary>
         private void SetupViewportOptions()
         {
-            var options = Editor.Instance.Options.Options;
+            var options = _editor.Options.Options;
             _minMovementSpeed = options.Viewport.MinMovementSpeed;
             MovementSpeed = options.Viewport.MovementSpeed;
             _maxMovementSpeed = options.Viewport.MaxMovementSpeed;
@@ -1701,7 +1701,7 @@ namespace FlaxEditor.Viewport
 
             // Check if update mouse
             var size = Size;
-            var options = Editor.Instance.Options.Options;
+            var options = _editor.Options.Options;
             if (_isControllingMouse)
             {
                 var rmbWheel = false;
@@ -1926,7 +1926,7 @@ namespace FlaxEditor.Viewport
                 return true;
 
             // Custom input events
-            return InputActions.Process(Editor.Instance, this, key);
+            return InputActions.Process(_editor, this, key);
         }
 
         /// <inheritdoc />
@@ -1943,7 +1943,7 @@ namespace FlaxEditor.Viewport
             base.Draw();
 
             // Add overlay during debugger breakpoint hang
-            if (Editor.Instance.Simulation.IsDuringBreakpointHang)
+            if (_editor.Simulation.IsDuringBreakpointHang)
             {
                 var bounds = new Rectangle(Float2.Zero, Size);
                 Render2D.FillRectangle(bounds, new Color(0.0f, 0.0f, 0.0f, 0.2f));
@@ -1967,7 +1967,7 @@ namespace FlaxEditor.Viewport
         /// <inheritdoc />
         public override void OnDestroy()
         {
-            Editor.Instance.Options.OptionsChanged -= OnEditorOptionsChanged;
+            _editor.Options.OptionsChanged -= OnEditorOptionsChanged;
 
             base.OnDestroy();
         }