diff --git a/iOS/MasterFeed/RefreshProgressView.swift b/iOS/MasterFeed/RefreshProgressView.swift
index 6a627e10a..ab2e61a84 100644
--- a/iOS/MasterFeed/RefreshProgressView.swift
+++ b/iOS/MasterFeed/RefreshProgressView.swift
@@ -13,7 +13,6 @@ class RefreshProgressView: UIView {
 	
 	@IBOutlet weak var progressView: UIProgressView!
 	@IBOutlet weak var label: UILabel!
-	private lazy var progressWidthConstraint = progressView.widthAnchor.constraint(equalToConstant: 100.0)
 	
 	override func awakeFromNib() {
 		NotificationCenter.default.addObserver(self, selector: #selector(progressDidChange(_:)), name: .AccountRefreshProgressDidChange, object: nil)
@@ -24,7 +23,7 @@ class RefreshProgressView: UIView {
 		} else {
 			updateRefreshLabel()
 		}
-		
+
 		scheduleUpdateRefreshLabel()
 	}
 
@@ -34,26 +33,26 @@ class RefreshProgressView: UIView {
 
 	func updateRefreshLabel() {
 		if let accountLastArticleFetchEndTime = AccountManager.shared.lastArticleFetchEndTime {
-			
+
 			if Date() > accountLastArticleFetchEndTime.addingTimeInterval(60) {
-				
+
 				let relativeDateTimeFormatter = RelativeDateTimeFormatter()
 				relativeDateTimeFormatter.dateTimeStyle = .named
 				let refreshed = relativeDateTimeFormatter.localizedString(for: accountLastArticleFetchEndTime, relativeTo: Date())
 				let localizedRefreshText = NSLocalizedString("Updated %@", comment: "Updated")
 				let refreshText = NSString.localizedStringWithFormat(localizedRefreshText as NSString, refreshed) as String
 				label.text = refreshText
-				
+
 			} else {
 				label.text = NSLocalizedString("Updated Just Now", comment: "Updated Just Now")
 			}
-			
+
 		} else {
 			label.text = ""
 		}
 
 	}
-	
+
 	@objc func progressDidChange(_ note: Notification) {
 		progressChanged()
 	}
@@ -80,27 +79,26 @@ private extension RefreshProgressView {
 		let isInViewHierarchy = self.superview != nil
 
 		let progress = AccountManager.shared.combinedRefreshProgress
-		
+
 		if progress.isComplete {
 			if isInViewHierarchy {
 				progressView.setProgress(1, animated: true)
 			}
 			DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-				self.updateRefreshLabel()
-				self.label.isHidden = false
-				self.progressView.isHidden = true
-				self.progressWidthConstraint.isActive = false
-				if isInViewHierarchy {
-					self.progressView.setProgress(0, animated: true)
+				// Check that there are no pending downloads.
+				if (AccountManager.shared.combinedRefreshProgress.isComplete) {
+					self.updateRefreshLabel()
+					self.label.isHidden = false
+					self.progressView.isHidden = true
+					if self.superview != nil {
+						self.progressView.setProgress(0, animated: true)
+					}
 				}
 			}
 		} else {
 			label.isHidden = true
 			progressView.isHidden = false
-			progressWidthConstraint.isActive = true
 			if isInViewHierarchy {
-				progressView.setNeedsLayout()
-				progressView.layoutIfNeeded()
 				let percent = Float(progress.numberCompleted) / Float(progress.numberOfTasks)
 
 				// Don't let the progress bar go backwards unless we need to go back more than 25%
diff --git a/iOS/MasterFeed/RefreshProgressView.xib b/iOS/MasterFeed/RefreshProgressView.xib
index 5e958f675..9c72af6c1 100644
--- a/iOS/MasterFeed/RefreshProgressView.xib
+++ b/iOS/MasterFeed/RefreshProgressView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -14,13 +14,14 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <progressView hidden="YES" opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="gKH-fc-zh7" customClass="RoundedProgressView" customModule="NetNewsWire" customModuleProvider="target">
-                    <rect key="frame" x="0.0" y="27.5" width="375" height="5"/>
+                    <rect key="frame" x="137.5" y="27.5" width="100" height="5"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="5" id="OCl-qi-owb"/>
+                        <constraint firstAttribute="width" constant="100" id="v3Q-GE-krS"/>
                     </constraints>
                 </progressView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="07B-Zy-FCt">
-                    <rect key="frame" x="0.0" y="30" width="375" height="0.0"/>
+                    <rect key="frame" x="187.5" y="30" width="0.0" height="0.0"/>
                     <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                     <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
@@ -28,11 +29,13 @@
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="07B-Zy-FCt" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="6eL-GN-NIE"/>
+                <constraint firstItem="07B-Zy-FCt" firstAttribute="centerX" secondItem="vUN-kp-3ea" secondAttribute="centerX" id="01K-1E-PEm"/>
+                <constraint firstItem="07B-Zy-FCt" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="vUN-kp-3ea" secondAttribute="leading" id="6eL-GN-NIE"/>
                 <constraint firstItem="07B-Zy-FCt" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="QJ0-os-kZt"/>
-                <constraint firstAttribute="trailing" secondItem="gKH-fc-zh7" secondAttribute="trailing" id="SbS-0T-bdo"/>
-                <constraint firstItem="gKH-fc-zh7" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="V0P-ix-fa3"/>
-                <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="07B-Zy-FCt" secondAttribute="trailing" id="Zor-53-U98"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="gKH-fc-zh7" secondAttribute="trailing" id="SbS-0T-bdo"/>
+                <constraint firstItem="gKH-fc-zh7" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="iN0-l3-epB" secondAttribute="leading" id="V0P-ix-fa3"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="07B-Zy-FCt" secondAttribute="trailing" id="Zor-53-U98"/>
+                <constraint firstItem="gKH-fc-zh7" firstAttribute="centerX" secondItem="vUN-kp-3ea" secondAttribute="centerX" id="eX0-hg-5sb"/>
                 <constraint firstItem="gKH-fc-zh7" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="mnf-7m-knt"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>