diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9b3b0137598..2ec976dd35d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1937,6 +1937,7 @@
                 android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
 
         <activity android:name="Settings$ApnEditorActivity"
+                android:configChanges="orientation|keyboardHidden|screenSize"
                 android:label="@string/apn_edit">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />