diff --git a/MacPass/MPKeyMapper.m b/MacPass/MPKeyMapper.m
index 7f681925..d4b1328a 100644
--- a/MacPass/MPKeyMapper.m
+++ b/MacPass/MPKeyMapper.m
@@ -84,7 +84,8 @@ uint16_t const kMPUnknownKeyCode = UINT16_MAX;
         tempCharToCodeDict[string] = @(keyCode);
       }
     }
-    keyboardCodeDictionary[localizedName] = [[NSDictionary alloc] initWithDictionary:tempCharToCodeDict];
+    charToCodeDict = [[NSDictionary alloc] initWithDictionary:tempCharToCodeDict];
+    keyboardCodeDictionary[localizedName] = charToCodeDict;
   }
   NSString *singleCharacter = [character substringToIndex:1].lowercaseString;
   if(charToCodeDict[singleCharacter]) {