diff --git a/src/i2p/bote/SetPasswordFragment.java b/src/i2p/bote/SetPasswordFragment.java
index a66c7f7..2f5d39b 100644
--- a/src/i2p/bote/SetPasswordFragment.java
+++ b/src/i2p/bote/SetPasswordFragment.java
@@ -76,6 +76,12 @@ public class SetPasswordFragment extends Fragment {
         mSubmit = (Button) view.findViewById(R.id.submit_password);
         mError = (TextView) view.findViewById(R.id.error);
 
+        // If task is running, disable the submit button.
+        PasswordWaiterFrag f = (PasswordWaiterFrag) mFM.findFragmentByTag(PASSWORD_WAITER_TAG);
+        if (f != null) {
+            mSubmit.setEnabled(false);
+        }
+
         mSubmit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {