diff --git a/ChangeLog b/ChangeLog
index ab6abbdae..724affde2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ Enhancements:
 
 Bug fixes:
 - #7144 Fix double lines when pasting text from Linux to Windows
+- #7149 Address issues with modifiers and dead keys
 
 Github Actions:
 - #7148 Fix unstable build for windows core
diff --git a/src/lib/platform/MSWindowsKeyState.cpp b/src/lib/platform/MSWindowsKeyState.cpp
index e24788e44..838f47428 100644
--- a/src/lib/platform/MSWindowsKeyState.cpp
+++ b/src/lib/platform/MSWindowsKeyState.cpp
@@ -1367,9 +1367,20 @@ MSWindowsKeyState::getIDForKey(synergy::KeyMap::KeyItem& item,
 	KeyID id = static_cast<KeyID>(unicode[0]);
 
 	switch (n) {
-	case -1:
-		return synergy::KeyMap::getDeadKey(id);
+	case -1: {
+		// dead key. add an space to the keyboard so we exit
+		// the dead key mode and future calls to this function
+		// with different modifiers are not affected.
 
+		BYTE emptyState[256] = { };
+		n = m_ToUnicodeEx(VK_SPACE, 0, emptyState, unicode,
+			sizeof(unicode) / sizeof(unicode[0]), 0, hkl);
+
+		// as an alternative, we could use the returned
+		// buffer in unicode to look at the dead key character
+		// and not rely on getDeadKey to provide the mapping
+		return synergy::KeyMap::getDeadKey(id);
+	}
 	default:
 	case 0:
 		// unmapped