diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.cpp
index edd45a7200..b660e87b56 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.cpp
@@ -511,6 +511,9 @@ namespace AzToolsFramework
                 m_previousGlobalCursorPosition = globalCursorPosition - screenDelta;
             }
             break;
+        case CursorInputMode::CursorModeNone:
+            m_previousGlobalCursorPosition = globalCursorPosition;
+            break;
         default: 
             AZ_Assert(false, "Invalid Curosr Mode: %i.", m_cursorMode);
             break;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.h
index b84ac99c74..67ef195363 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.h
@@ -39,8 +39,8 @@ namespace AzToolsFramework
                               //!< events don't allow the cursor to escape. This can be used for typical camera controls
                               //!< like a dolly or rotation, where mouse movement is important but cursor location is not.
         CursorModeWrapped,    //!< Flags whether the curser is going to wrap around the soruce widget.
-        CursorModeWrappedX,
-        CursorModeWrappedY 
+        CursorModeWrappedX,   //!< Flags whether the curser is going to wrap around the soruce widget only on the left and right side.
+        CursorModeWrappedY    //!< Flags whether the curser is going to wrap around the soruce widget only on the top and bottom side.
     };
 
     //! Maps events from the Qt input system to synthetic InputChannels in AzFramework
diff --git a/Code/Framework/AzToolsFramework/Tests/Input/QtEventToAzInputMapperTests.cpp b/Code/Framework/AzToolsFramework/Tests/Input/QtEventToAzInputMapperTests.cpp
index 9af445850c..0282812be7 100644
--- a/Code/Framework/AzToolsFramework/Tests/Input/QtEventToAzInputMapperTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Input/QtEventToAzInputMapperTests.cpp
@@ -533,23 +533,38 @@ namespace UnitTest
     {
     };
 
-    TEST_P(MoveMoveWrapParamQtEventToAzInputMapperFixture, MouseMove_NoAzHandlers_VerifyMouseMovmentViewport) 
+    TEST_P(MoveMoveWrapParamQtEventToAzInputMapperFixture, MouseMove_NoAzHandlers_VerifyMouseMovementViewport)
     {
+        //TODO: mouseMove is bugged mapToGlobal is called twice
+        auto mouseMoveFix = [](QWidget* wid, QPoint globalPos, QPoint deltaPos)
+        {
+            QPoint globalPosition = globalPos + deltaPos;
+            QPoint localPosition = wid->mapFromGlobal(globalPosition);
+            QTest::mouseMove(wid, localPosition);
+            QMouseEvent mouseMoveEvent(QEvent::MouseMove, localPosition, globalPosition, Qt::NoButton, Qt::NoButton, Qt::NoModifier);
+            QApplication::sendEvent(wid, &mouseMoveEvent);
+        };
+
         // setup
         const MouseMoveParam mouseMoveParam = GetParam();
 
         AzFramework::InputChannelNotificationBus::Handler::BusConnect();
         m_captureAzEvents = false;
-        m_inputChannelMapper->SetCursorMode(mouseMoveParam.mode);
+
         m_rootWidget->move(100, 100);
+        mouseMoveFix(m_rootWidget.get(), m_rootWidget->mapToGlobal(mouseMoveParam.startPos), QPoint(0, 0));
 
+        // given
+        m_inputChannelMapper->SetCursorMode(mouseMoveParam.mode);
 
-        MouseMove(m_rootWidget.get(), mouseMoveParam.startPos, QPoint(0,0));
-        for(float i = 0; i < mouseMoveParam.iterations; i++) {
-            MouseMove(m_rootWidget.get(), m_rootWidget->mapFromGlobal(QCursor::pos()), (mouseMoveParam.deltaPos / mouseMoveParam.iterations));
+        mouseMoveFix(m_rootWidget.get(), m_rootWidget->mapToGlobal(mouseMoveParam.startPos), QPoint(0, 0));
+        for (float i = 0; i < mouseMoveParam.iterations; i++)
+        {
+            mouseMoveFix(m_rootWidget.get(), QCursor::pos(), (mouseMoveParam.deltaPos / mouseMoveParam.iterations));
         }
 
-        QPointF endPosition = m_rootWidget->mapFromGlobal(QCursor::pos());
+        // validate
+        QPoint endPosition = m_rootWidget->mapFromGlobal(QCursor::pos());
         EXPECT_NEAR(endPosition.x(), mouseMoveParam.expectedPos.x(), 1.0f);
         EXPECT_NEAR(endPosition.y(), mouseMoveParam.expectedPos.y(), 1.0f);
 
@@ -649,6 +664,22 @@ namespace UnitTest
                 QPoint(0, 40),
                 QPoint(QtEventToAzInputMapperFixture::WidgetSize.width() / 2.0f, 20),
                  "CursorModeWrapped_Test_Bottom"
+                },
+            // verify CursorModeCaptured 
+            MouseMoveParam {AzToolsFramework::CursorInputMode::CursorModeCaptured, 
+                40,
+                QPoint(QtEventToAzInputMapperFixture::WidgetSize.width() / 2.0f, QtEventToAzInputMapperFixture::WidgetSize.height() / 2.0f),
+                QPoint(0, 40),
+                QPoint(QtEventToAzInputMapperFixture::WidgetSize.width() / 2.0f, QtEventToAzInputMapperFixture::WidgetSize.height() / 2.0f),
+                 "CursorModeCaptured"
+                },
+            // verify CursorModeNone 
+            MouseMoveParam {AzToolsFramework::CursorInputMode::CursorModeNone, 
+                40,
+                QPoint(QtEventToAzInputMapperFixture::WidgetSize.width() / 2.0f, QtEventToAzInputMapperFixture::WidgetSize.height() / 2.0f),
+                QPoint(40.0f, 0),
+                QPoint((QtEventToAzInputMapperFixture::WidgetSize.width() / 2.0f) + 40.0f, (QtEventToAzInputMapperFixture::WidgetSize.height() / 2.0f)),
+                 "CursorModeNone"
                 }
         ),
         [](const ::testing::TestParamInfo<MouseMoveParam>& info)