diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5ca3e5bf8fc..b0866da2b08 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -143,7 +143,9 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".wifi.WifiApSettings">
+        <activity android:name=".wifi.WifiApSettings"
+                android:configChanges="orientation|keyboardHidden"
+                >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />