diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index e288763..4c62de2 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -135,6 +135,9 @@
         super.onStart();
 
         updateForbiddenPlmns();
+        if (isProgressBarVisible()) {
+            return;
+        }
         setProgressBarVisible(true);
 
         mNetworkScanHelper.startNetworkScan(
@@ -157,7 +160,6 @@
     @Override
     public void onStop() {
         super.onStop();
-        stopNetworkQuery();
     }
 
     @Override
@@ -377,6 +379,13 @@
         mConnectedPreferenceCategory.setVisible(true);
     }
 
+    private boolean isProgressBarVisible() {
+        if (mProgressHeader == null) {
+            return false;
+        }
+        return (mProgressHeader.getVisibility() == View.VISIBLE);
+    }
+
     protected void setProgressBarVisible(boolean visible) {
         if (mProgressHeader != null) {
             mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE);
@@ -425,6 +434,7 @@
 
     @Override
     public void onDestroy() {
+        stopNetworkQuery();
         mNetworkScanExecutor.shutdown();
         super.onDestroy();
     }