diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m
index db4d3826ad..bfcf0e07f8 100644
--- a/src/MacVim/MMAppController.m
+++ b/src/MacVim/MMAppController.m
@@ -1721,12 +1721,17 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
         while ((param = [enumerator nextObject])) {
             NSArray *arr = [param componentsSeparatedByString:@"="];
             if ([arr count] == 2) {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_11
+              [dict setValue:[[arr lastObject] stringByRemovingPercentEncoding]
+                      forKey:[[arr objectAtIndex:0] stringByRemovingPercentEncoding]];
+#else
                 [dict setValue:[[arr lastObject]
                             stringByReplacingPercentEscapesUsingEncoding:
                                 NSUTF8StringEncoding]
                         forKey:[[arr objectAtIndex:0]
                             stringByReplacingPercentEscapesUsingEncoding:
                                 NSUTF8StringEncoding]];
+#endif
             }
         }