diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp b/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp
index d5b35de3cf..fedf57b893 100644
--- a/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp
@@ -21,6 +21,7 @@
 #include <FancyZonesLib/FancyZonesWindowProcessing.h>
 #include <FancyZonesLib/FancyZonesWindowProperties.h>
 #include <FancyZonesLib/FancyZonesWinHookEventIDs.h>
+#include <FancyZonesLib/KeyboardInput.h>
 #include <FancyZonesLib/MonitorUtils.h>
 #include <FancyZonesLib/on_thread_executor.h>
 #include <FancyZonesLib/Settings.h>
@@ -172,6 +173,7 @@ private:
     const HINSTANCE m_hinstance{};
 
     HWND m_window{};
+    KeyboardInput m_keyboardInput{};
     std::unique_ptr<WindowMouseSnap> m_windowMouseSnapper{};
     WindowKeyboardSnap m_windowKeyboardSnapper{};
     WorkAreaConfiguration m_workAreaConfiguration;
@@ -220,7 +222,13 @@ FancyZones::Run() noexcept
     m_window = CreateWindowExW(WS_EX_TOOLWINDOW, NonLocalizable::ToolWindowClassName, L"", WS_POPUP, 0, 0, 0, 0, nullptr, nullptr, m_hinstance, this);
     if (!m_window)
     {
-        Logger::error(L"Failed to create FancyZones window");
+        Logger::critical(L"Failed to create FancyZones window");
+        return;
+    }
+
+    if (!m_keyboardInput.Initialize(m_window))
+    {
+        Logger::critical(L"Failed to register raw input device");
         return;
     }
 
diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj
index 8b8315edb6..bff83a8d09 100644
--- a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj
+++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj
@@ -53,6 +53,7 @@
     <ClInclude Include="FancyZonesData.h" />
     <ClInclude Include="GuidUtils.h" />
     <ClInclude Include="JsonHelpers.h" />
+    <ClInclude Include="KeyboardInput.h" />
     <ClInclude Include="KeyState.h" />
     <ClInclude Include="FancyZonesData\LayoutHotkeys.h" />
     <ClInclude Include="Layout.h" />
@@ -114,6 +115,7 @@
     <ClCompile Include="FancyZonesData\LayoutHotkeys.cpp">
       <PrecompiledHeaderFile>../pch.h</PrecompiledHeaderFile>
     </ClCompile>
+    <ClCompile Include="KeyboardInput.cpp" />
     <ClCompile Include="Layout.cpp" />
     <ClCompile Include="LayoutConfigurator.cpp" />
     <ClCompile Include="LayoutAssignedWindows.cpp" />
diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj.filters b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj.filters
index c72ebd2892..d2a909f577 100644
--- a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj.filters
+++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj.filters
@@ -168,6 +168,9 @@
     <ClInclude Include="FancyZonesData\LastUsedVirtualDesktop.h">
       <Filter>Header Files\FancyZonesData</Filter>
     </ClInclude>
+    <ClInclude Include="KeyboardInput.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -278,6 +281,9 @@
     <ClCompile Include="FancyZonesWindowProcessing.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="KeyboardInput.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/src/modules/fancyzones/FancyZonesLib/KeyboardInput.cpp b/src/modules/fancyzones/FancyZonesLib/KeyboardInput.cpp
new file mode 100644
index 0000000000..dfc40da836
--- /dev/null
+++ b/src/modules/fancyzones/FancyZonesLib/KeyboardInput.cpp
@@ -0,0 +1,24 @@
+#include "pch.h"
+#include "KeyboardInput.h"
+
+#include <hidusage.h>
+
+#include <common/logger/logger.h>
+#include <common/utils/winapi_error.h>
+
+bool KeyboardInput::Initialize(HWND window)
+{
+    RAWINPUTDEVICE inputDevice{};
+    inputDevice.usUsagePage = HID_USAGE_PAGE_GENERIC;
+    inputDevice.usUsage = HID_USAGE_GENERIC_KEYBOARD;
+    inputDevice.dwFlags = RIDEV_INPUTSINK;
+    inputDevice.hwndTarget = window;
+
+    bool res = RegisterRawInputDevices(&inputDevice, 1, sizeof(inputDevice));
+    if (!res)
+    {
+        Logger::error(L"RegisterRawInputDevices error: {}", get_last_error_or_default(GetLastError()));
+    }
+
+    return res;
+}
diff --git a/src/modules/fancyzones/FancyZonesLib/KeyboardInput.h b/src/modules/fancyzones/FancyZonesLib/KeyboardInput.h
new file mode 100644
index 0000000000..a461ece4c3
--- /dev/null
+++ b/src/modules/fancyzones/FancyZonesLib/KeyboardInput.h
@@ -0,0 +1,10 @@
+#pragma once
+
+class KeyboardInput
+{
+public: 
+	KeyboardInput() = default;
+    ~KeyboardInput() = default;
+
+	bool Initialize(HWND window);
+};