diff --git a/Demo/HudDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo/HudDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000..18d981003
--- /dev/null
+++ b/Demo/HudDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/MBProgressHUD.m b/MBProgressHUD.m
index a2829a390..f3fdd5833 100644
--- a/MBProgressHUD.m
+++ b/MBProgressHUD.m
@@ -140,6 +140,10 @@ - (void)showAnimated:(BOOL)animated {
     }
     // ... otherwise show the HUD immediately
     else {
+        // Modified grace time to 0 and show again
+        [self.graceTimer invalidate];
+        // fix #605: https://github.com/jdg/MBProgressHUD/issues/605
+        [self.hideDelayTimer invalidate];
         [self showUsingAnimation:self.useAnimation];
     }
 }
@@ -203,9 +207,6 @@ - (void)showUsingAnimation:(BOOL)animated {
     [self.bezelView.layer removeAllAnimations];
     [self.backgroundView.layer removeAllAnimations];
 
-    // Cancel any scheduled hideAnimated:afterDelay: calls
-    [self.hideDelayTimer invalidate];
-
     self.showStarted = [NSDate date];
     self.alpha = 1.f;