diff --git a/NzbDrone.Core.Test/EpisodeStatusTest.cs b/NzbDrone.Core.Test/EpisodeStatusTest.cs
index c4c551015..0861042c2 100644
--- a/NzbDrone.Core.Test/EpisodeStatusTest.cs
+++ b/NzbDrone.Core.Test/EpisodeStatusTest.cs
@@ -61,8 +61,8 @@ public void old_grab_date(int offsetDays, bool hasEpisodes, bool ignored,
 
         [TestCase(1, false, false, EpisodeStatusType.Downloading)]
         [TestCase(-2, false, false, EpisodeStatusType.Downloading)]
-        [TestCase(1, true, false, EpisodeStatusType.Downloading)]
-        [TestCase(1, true, true, EpisodeStatusType.Downloading)]
+        [TestCase(1, true, false, EpisodeStatusType.Ready)]
+        [TestCase(1, true, true, EpisodeStatusType.Ready)]
         [TestCase(1, false, true, EpisodeStatusType.Downloading)]
         public void recent_grab_date(int offsetDays, bool hasEpisodes, bool ignored,
                                                     EpisodeStatusType status)
diff --git a/NzbDrone.Core.Test/IndexerTests.cs b/NzbDrone.Core.Test/IndexerTests.cs
index 90522688a..93df7243b 100644
--- a/NzbDrone.Core.Test/IndexerTests.cs
+++ b/NzbDrone.Core.Test/IndexerTests.cs
@@ -212,6 +212,7 @@ public void nzbsorg_search_returns_valid_results(string title, int season, int e
 
         [TestCase("simpsons", 21, 23)]
         [TestCase("Hawaii Five-0 (2010)", 1, 1)]
+        [TestCase("In plain Sight", 1, 11)]
         public void newzbin_search_returns_valid_results(string title, int season, int episode)
         {
             var mocker = new AutoMoqer();
diff --git a/NzbDrone.Core/Repository/Episode.cs b/NzbDrone.Core/Repository/Episode.cs
index 18b6173f4..be18a06d2 100644
--- a/NzbDrone.Core/Repository/Episode.cs
+++ b/NzbDrone.Core/Repository/Episode.cs
@@ -37,14 +37,14 @@ public EpisodeStatusType Status
         {
             get
             {
+
+                if (EpisodeFileId != 0) return EpisodeStatusType.Ready;
+
                 if (GrabDate != null && GrabDate.Value.AddDays(1) >= DateTime.Now)
                 {
                     return EpisodeStatusType.Downloading;
                 }
-
-                if (EpisodeFileId != 0) return EpisodeStatusType.Ready;
-
-
+                
                 if (Ignored) return EpisodeStatusType.Ignored;
 
                 if (AirDate != null && AirDate.Value.Date < DateTime.Now)