diff --git a/MacPass/MPAutotypeDaemon.m b/MacPass/MPAutotypeDaemon.m
index b0a0839f..4c8bd0ac 100644
--- a/MacPass/MPAutotypeDaemon.m
+++ b/MacPass/MPAutotypeDaemon.m
@@ -27,7 +27,7 @@ NSString *const kMPWindowTitleKey = @"windowTitle";
 NSString *const kMPApplciationNameKey = @"applicationName";
 
 /*
- Enabel to activate autotype
+ Enable to activate autotype
 #define MP_AUTOTYPE
 */
 
diff --git a/MacPass/MPDocument+Autotype.m b/MacPass/MPDocument+Autotype.m
index 6d711986..482f878c 100644
--- a/MacPass/MPDocument+Autotype.m
+++ b/MacPass/MPDocument+Autotype.m
@@ -37,8 +37,12 @@
   NSArray *autotypeEntries = [self.root autotypeableChildEntries];
   NSMutableArray *contexts = [[NSMutableArray alloc] initWithCapacity:MAX(1,ceil([autotypeEntries count] / 4.0))];
   for(KPKEntry *entry in autotypeEntries) {
-    /* Test for title */
-    NSRange titleRange = [entry.title rangeOfString:windowTitle options:NSCaseInsensitiveSearch];
+    /* Test for entry title in window title */
+    NSRange titleRange = [windowTitle rangeOfString:entry.title options:NSCaseInsensitiveSearch];
+    /* Test for window title in entry title */
+    if (titleRange.location == NSNotFound || titleRange.length == 0) {
+      titleRange = [entry.title rangeOfString:windowTitle options:NSCaseInsensitiveSearch];
+    }
     MPAutotypeContext *context;
     if(titleRange.location != NSNotFound && titleRange.length != 0) {
       context = [[MPAutotypeContext alloc] initWithEntry:entry andSequence:entry.autotype.defaultKeystrokeSequence];