diff --git a/java/src/com/android/inputmethod/latin/DebugSettingsActivity.java b/java/src/com/android/inputmethod/latin/DebugSettingsActivity.java
index 2a501a6..e1b5a80 100644
--- a/java/src/com/android/inputmethod/latin/DebugSettingsActivity.java
+++ b/java/src/com/android/inputmethod/latin/DebugSettingsActivity.java
@@ -21,15 +21,18 @@
 import android.preference.PreferenceActivity;
 
 public final class DebugSettingsActivity extends PreferenceActivity {
+    private static final String DEFAULT_FRAGMENT = DebugSettings.class.getName();
+
     @Override
     public Intent getIntent() {
-        final Intent modIntent = new Intent(super.getIntent());
-        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, DebugSettings.class.getName());
-        return modIntent;
+        final Intent intent = super.getIntent();
+        intent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT);
+        intent.putExtra(EXTRA_NO_HEADERS, true);
+        return intent;
     }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTitle(R.string.english_ime_debug_settings);
     }
diff --git a/java/src/com/android/inputmethod/latin/SettingsActivity.java b/java/src/com/android/inputmethod/latin/SettingsActivity.java
index ed8cf6d..99b572e 100644
--- a/java/src/com/android/inputmethod/latin/SettingsActivity.java
+++ b/java/src/com/android/inputmethod/latin/SettingsActivity.java
@@ -25,9 +25,7 @@
     @Override
     public Intent getIntent() {
         final Intent intent = super.getIntent();
-        if (!intent.hasExtra(EXTRA_SHOW_FRAGMENT)) {
-            intent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT);
-        }
+        intent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT);
         intent.putExtra(EXTRA_NO_HEADERS, true);
         return intent;
     }