diff --git a/GlitchyEditor/src/EditWindows/SceneViewportWindow.bf b/GlitchyEditor/src/EditWindows/SceneViewportWindow.bf
index e78a082..12d005e 100644
--- a/GlitchyEditor/src/EditWindows/SceneViewportWindow.bf
+++ b/GlitchyEditor/src/EditWindows/SceneViewportWindow.bf
@@ -56,10 +56,15 @@ namespace GlitchyEditor.EditWindows
 
 			ShowMenuBar();
 
+			var viewportSize = ImGui.GetContentRegionAvail();
+
 			if(ImGui.IsWindowHovered() && Input.IsMouseButtonPressing(.RightButton))
 			{
 				var currentWindow = ImGui.GetCurrentWindow();
 				ImGui.FocusWindow(currentWindow);
+
+				if (_editor.CurrentCamera.[Friend]BindMouse)
+					WrapMouseInViewport();
 			}
 
 			_hasFocus = ImGui.IsWindowFocused();
@@ -79,11 +84,6 @@ namespace GlitchyEditor.EditWindows
 					_gizmoMode = .LOCAL;
 			}
 
-			var viewportSize = ImGui.GetContentRegionAvail();
-
-			if (_editor.CurrentCamera.[Friend]BindMouse)
-				WrapMouseInViewport();
-
 			if(_renderTarget != null)
 			{
 				ImGui.Image(_renderTarget.GetViewBinding(0), viewportSize);