diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 702b7aea2..f37f6cc4b 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -102,14 +102,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".settings.DebugSettingsActivity"
-                android:theme="@style/platformSettingsTheme"
-                android:label="@string/english_ime_debug_settings">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-        </activity>
-
         <receiver android:name="SuggestionSpanPickedNotificationReceiver" android:enabled="true">
             <intent-filter>
                 <action android:name="android.text.style.SUGGESTION_PICKED" />
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 550e71ada..6febb3126 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -199,6 +199,7 @@
             android:defaultValue="true"
             android:persistent="true" />
         <PreferenceScreen
+            android:fragment="com.android.inputmethod.latin.settings.DebugSettings"
             android:key="screen_debug"
             android:title="Debug settings"
             android:defaultValue="false"
diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_screen_debug.xml
similarity index 100%
rename from java/res/xml/prefs_for_debug.xml
rename to java/res/xml/prefs_screen_debug.xml
diff --git a/java/src/com/android/inputmethod/latin/settings/DebugSettings.java b/java/src/com/android/inputmethod/latin/settings/DebugSettings.java
index c6a70244c..e4271adac 100644
--- a/java/src/com/android/inputmethod/latin/settings/DebugSettings.java
+++ b/java/src/com/android/inputmethod/latin/settings/DebugSettings.java
@@ -61,7 +61,7 @@ public final class DebugSettings extends PreferenceFragment
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        addPreferencesFromResource(R.xml.prefs_for_debug);
+        addPreferencesFromResource(R.xml.prefs_screen_debug);
         TwoStatePreferenceHelper.replaceCheckBoxPreferencesBySwitchPreferences(
                 getPreferenceScreen());
         SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
diff --git a/java/src/com/android/inputmethod/latin/settings/DebugSettingsActivity.java b/java/src/com/android/inputmethod/latin/settings/DebugSettingsActivity.java
deleted file mode 100644
index a23e37795..000000000
--- a/java/src/com/android/inputmethod/latin/settings/DebugSettingsActivity.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.inputmethod.latin.settings;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.preference.PreferenceActivity;
-
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.FragmentUtils;
-
-public final class DebugSettingsActivity extends PreferenceActivity {
-    private static final String DEFAULT_FRAGMENT = DebugSettings.class.getName();
-
-    @Override
-    public Intent getIntent() {
-        final Intent intent = super.getIntent();
-        intent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT);
-        intent.putExtra(EXTRA_NO_HEADERS, true);
-        return intent;
-    }
-
-    @Override
-    protected void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setTitle(R.string.english_ime_debug_settings);
-    }
-
-    // TODO: Uncomment the override annotation once we start using SDK version 19.
-    // @Override
-    public boolean isValidFragment(String fragmentName) {
-        return FragmentUtils.isValidFragment(fragmentName);
-    }
-}
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
index a9d95fc82..ac5d71c0b 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
@@ -136,12 +136,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment
         final PreferenceScreen debugScreen =
                 (PreferenceScreen) findPreference(Settings.SCREEN_DEBUG);
 
-        if (Settings.isInternal(prefs)) {
-            final Intent debugSettingsIntent = new Intent(Intent.ACTION_MAIN);
-            debugSettingsIntent.setClassName(
-                    context.getPackageName(), DebugSettingsActivity.class.getName());
-            debugScreen.setIntent(debugSettingsIntent);
-        } else {
+        if (!Settings.isInternal(prefs)) {
             advancedScreen.removePreference(debugScreen);
         }