diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index eff487b..30d159b 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -150,7 +150,10 @@
 
         @Override
         protected void onPostExecute(Boolean succeeded) {
-            mProgressDialog.dismiss();
+            if (mProgressDialog != null && mProgressDialog.isShowing()) {
+                mProgressDialog.dismiss();
+            }
+
             if (succeeded) {
                 Toast.makeText(mContext, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
                         .show();
@@ -189,6 +192,12 @@
                 }
             }
 
+            // Should dismiss the progress dialog firstly if it is showing
+            // Or not the progress dialog maybe not dismissed in fast clicking.
+            if (mProgressDialog != null && mProgressDialog.isShowing()) {
+                mProgressDialog.dismiss();
+            }
+
             mProgressDialog = getProgressDialog(mActivity);
             mProgressDialog.show();
 
