diff --git a/ChangeLog b/ChangeLog
index 54566ead6..cae57649a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ Bug fixes:
 - #7080 Add trace if the system can't open file with trusted fingerprints
 - #7081 Fix autoconfig after SYNERGY-1161
 - #7082 Windows client doesn't resume connection after sleep
+- #7089 Modifier keys don't work on Microsoft Remote Desktop
 
 Enhancements:
 - #7068 Add Synergy restart when settings changed
diff --git a/src/lib/platform/OSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp
index 35bf35f40..fbf45949a 100644
--- a/src/lib/platform/OSXKeyState.cpp
+++ b/src/lib/platform/OSXKeyState.cpp
@@ -483,19 +483,19 @@ OSXKeyState::getKeyboardEventFlags()
     CGEventFlags modifiers = 0;
 
     if (m_shiftPressed) {
-        modifiers |= kCGEventFlagMaskShift;
+        modifiers |= kCGEventFlagMaskShift | NX_DEVICELSHIFTKEYMASK;
     }
 
     if (m_controlPressed) {
-        modifiers |= kCGEventFlagMaskControl;
+        modifiers |= kCGEventFlagMaskControl | NX_DEVICELCTLKEYMASK;
     }
 
     if (m_altPressed) {
-        modifiers |= kCGEventFlagMaskAlternate;
+        modifiers |= kCGEventFlagMaskAlternate | NX_DEVICELALTKEYMASK;
     }
 
     if (m_superPressed) {
-        modifiers |= kCGEventFlagMaskCommand;
+        modifiers |= kCGEventFlagMaskCommand | NX_DEVICELCMDKEYMASK;
     }
 
     if (m_capsPressed) {