diff --git a/src/lib/synergy/KeyMap.cpp b/src/lib/synergy/KeyMap.cpp
index db37c611..405334fc 100644
--- a/src/lib/synergy/KeyMap.cpp
+++ b/src/lib/synergy/KeyMap.cpp
@@ -697,7 +697,8 @@ KeyMap::findBestKey(const KeyEntryList& entryList,
 	// check for an item that can accommodate the desiredState exactly
 	for (SInt32 i = 0; i < (SInt32)entryList.size(); ++i) {
 		const KeyItem& item = entryList[i].back();
-		if ((item.m_required & desiredState) == item.m_required) {
+		if ((item.m_required & desiredState) == item.m_required &&
+			(item.m_required & desiredState) == (item.m_sensitive & desiredState)) {
 			LOG((CLOG_DEBUG1 "best key index %d of %d (exact)", i + 1, entryList.size()));
 			return i;
 		}