diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index f6e7917..38658e7 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -207,8 +207,6 @@
 
     private WifiDialog2 mDialog;
 
-    private View mProgressHeader;
-
     @VisibleForTesting
     PreferenceCategory mConnectedWifiEntryPreferenceCategory;
     @VisibleForTesting
@@ -255,8 +253,7 @@
             return;
         }
 
-        mProgressHeader = setPinnedHeaderView(R.layout.progress_header)
-                .findViewById(R.id.progress_bar_animation);
+        setPinnedHeaderView(R.layout.progress_header);
         setProgressBarVisible(false);
 
         mWifiManager = activity.getSystemService(WifiManager.class);
@@ -1006,9 +1003,7 @@
     }
 
     protected void setProgressBarVisible(boolean visible) {
-        if (mProgressHeader != null) {
-            mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE);
-        }
+        showPinnedHeader(visible);
     }
 
     @VisibleForTesting
