diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/MaximumSizeSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/MaximumSizeSpecification.cs
index 9f7044876..a990a00ed 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/MaximumSizeSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/MaximumSizeSpecification.cs
@@ -31,7 +31,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                 return Decision.Accept();
             }
 
-            if (subject.Release.Size == 0)
+            if (size == 0)
             {
                 _logger.Debug("Release has unknown size, skipping size check.");
                 return Decision.Accept();
diff --git a/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.hbs b/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.hbs
index 094ef2884..1773db773 100644
--- a/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.hbs
@@ -12,18 +12,6 @@
             <input type="number" min="0" name="minimumAge" class="form-control"/>
         </div>
     </div>
-	
-	<div class="form-group">
-        <label class="col-sm-3 control-label">Maximum Size</label>
-
-        <div class="col-sm-1 col-sm-push-2 help-inline">
-            <i class="icon-sonarr-form-info" title="Maximum size for a release to be grabbed in MB. Set to zero to set to unlimited"/>
-        </div>
-
-        <div class="col-sm-2 col-sm-pull-1">
-            <input type="number" min="0" name="maximumSize" class="form-control"/>
-        </div>
-    </div>
 
     <div class="form-group">
         <label class="col-sm-3 control-label">Retention</label>
@@ -37,6 +25,18 @@
         </div>
     </div>
 
+    <div class="form-group">
+        <label class="col-sm-3 control-label">Maximum Size</label>
+
+        <div class="col-sm-1 col-sm-push-2 help-inline">
+            <i class="icon-sonarr-form-info" title="Maximum size for a release to be grabbed in MB. Set to zero to set to unlimited"/>
+        </div>
+
+        <div class="col-sm-2 col-sm-pull-1">
+            <input type="number" min="0" name="maximumSize" class="form-control"/>
+        </div>
+    </div>
+
     <div class="form-group advanced-setting">
         <label class="col-sm-3 control-label">RSS Sync Interval</label>