diff --git a/src/com/android/browser/AutoFillSettingsFragment.java b/src/com/android/browser/AutoFillSettingsFragment.java
index 639fcdc..7be657d 100644
--- a/src/com/android/browser/AutoFillSettingsFragment.java
+++ b/src/com/android/browser/AutoFillSettingsFragment.java
@@ -54,6 +54,8 @@
 
     private MenuItem mSaveMenuItem;
 
+    private boolean mInitialised;
+
     // Used to display toast after DB interactions complete.
     private Handler mHandler;
     private BrowserSettings mSettings;
@@ -241,6 +243,8 @@
             mPhoneEdit.setText(activeProfile.getPhoneNumber());
         }
 
+        mInitialised = true;
+
         updateSaveMenuItemState();
 
         return v;
@@ -251,6 +255,11 @@
             return;
         }
 
+        if (!mInitialised) {
+            mSaveMenuItem.setEnabled(false);
+            return;
+        }
+
         boolean currentState = mSaveMenuItem.isEnabled();
         boolean newState = (mFullNameEdit.getText().toString().length() > 0 ||
             mEmailEdit.getText().toString().length() > 0 ||