diff --git a/MacPass/NSRunningApplication+MPAdditions.h b/MacPass/NSRunningApplication+MPAdditions.h
index fadf3007..3cf3e3b4 100644
--- a/MacPass/NSRunningApplication+MPAdditions.h
+++ b/MacPass/NSRunningApplication+MPAdditions.h
@@ -13,9 +13,11 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+APPKIT_EXTERN NSString *const MPWindowIDKey;
 APPKIT_EXTERN NSString *const MPWindowTitleKey;
 APPKIT_EXTERN NSString *const MPProcessIdentifierKey;
 
+
 @interface NSRunningApplication (MPAdditions)
 
 @property (readonly, copy) NSDictionary *mp_infoDictionary;
diff --git a/MacPass/NSRunningApplication+MPAdditions.m b/MacPass/NSRunningApplication+MPAdditions.m
index 58b4b29a..3c51e067 100644
--- a/MacPass/NSRunningApplication+MPAdditions.m
+++ b/MacPass/NSRunningApplication+MPAdditions.m
@@ -10,11 +10,10 @@
 
 #import <AppKit/AppKit.h>
 
-
+NSString *const MPWindowIDKey = @"MPWindowIDKey";
 NSString *const MPWindowTitleKey = @"MPWindowTitleKey";
 NSString *const MPProcessIdentifierKey = @"MPProcessIdentifierKey";
 
-
 BOOL skipWindowTitle(NSString *windowTitle) {
   if(windowTitle.length <= 0) {
     return YES;
@@ -45,11 +44,12 @@ BOOL skipWindowTitle(NSString *windowTitle) {
     NSNumber *processId = windowDict[(NSString *)kCGWindowOwnerPID];
     if(processId && [processId isEqualToNumber:@(self.processIdentifier)]) {
       
-      NSNumber *number = (NSNumber *)windowDict[(NSString *)kCGWindowNumber];
-      NSUInteger zIndex = [windowNumbers indexOfObject:number];
+      NSNumber *windowId = (NSNumber *)windowDict[(NSString *)kCGWindowNumber];
+      NSUInteger zIndex = [windowNumbers indexOfObject:windowId];
       if(zIndex < minZIndex) {
         minZIndex = zIndex;
         infoDict = @{
+          MPWindowIDKey: windowId,
           MPWindowTitleKey: windowTitle,
           MPProcessIdentifierKey : processId
         };