pull from master

1 files changed, 5 insertions, 5 deletions

diff --git a/src/fields/KeyStore.ts b/src/fields/KeyStore.ts
index 42dc34c51..425408273 100644
--- a/src/fields/KeyStore.ts
+++ b/src/fields/KeyStore.ts
@@ -55,11 +55,11 @@ export namespace KeyStore {
         Archives, Workspaces, Minimized, CopyDraggedItems
     ];
     export function KeyLookup(keyid: string) {
-        for (let i = 0; i < KeyList.length; i++) {
-            let keylistid = KeyList[i].Id;
-            if (keylistid === keyid)
-                return KeyList[i];
+        for (const key of KeyList) {
+            if (key.Id === keyid) {
+                return key;
+            }
         }
-        return null;
+        return undefined;
     }
 }