diff --git a/src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj b/src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj
index 433e7599d5..318db41ba6 100644
--- a/src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj
+++ b/src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj
@@ -58,6 +58,7 @@
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
diff --git a/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp b/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp
index 7c6a7926db..700742d7df 100644
--- a/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp
+++ b/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp
@@ -14,6 +14,7 @@
 #include <common/utils/winapi_error.h>
 #include <common/interop/shared_constants.h>
 #include <Psapi.h>
+#include <Shlwapi.h>
 #include <TlHelp32.h>
 #include <thread>
 
@@ -49,6 +50,29 @@ private:
     // Track if this is the first call to enable
     bool firstEnableCall = true;
 
+    static bool IsUriProtocolRegistered(const std::wstring& protocol)
+    {
+        WCHAR executable[MAX_PATH] = { 0 };
+        DWORD buffer_length = MAX_PATH;
+        
+        // Query if there's an executable associated with this URI protocol
+        HRESULT hr = AssocQueryString(ASSOCF_INIT_IGNOREUNKNOWN,
+                                      ASSOCSTR_EXECUTABLE,
+                                      protocol.c_str(),
+                                      nullptr,
+                                      executable,
+                                      &buffer_length);
+        
+        if (SUCCEEDED(hr) && buffer_length > 0)
+        {
+            Logger::trace(L"URI protocol '{}' is registered with executable: {}", protocol, executable);
+            return true;
+        }
+        
+        Logger::trace(L"URI protocol '{}' is not registered. HRESULT: 0x{:X}", protocol, static_cast<unsigned long>(hr));
+        return false;
+    }
+
     static bool LaunchApp(const std::wstring& appPath, const std::wstring& commandLineArgs, bool elevated, bool silentFail)
     {
         std::wstring dir = std::filesystem::path(appPath).parent_path();
@@ -269,6 +293,13 @@ public:
             return;
         }
 
+        // Check if x-cmdpal URI protocol handler is registered
+        if (!IsUriProtocolRegistered(L"x-cmdpal"))
+        {
+            Logger::error("x-cmdpal URI protocol handler is not registered. Cannot launch CmdPal.");
+            return;
+        }
+
         if (!firstEnableCall)
         {
             Logger::trace("Not first attempt, try to launch");