diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b1e8a7a795c99ec2445f94d213e1cfd94f4e2c41..fbb728d241bf777475b1aeb85a79b2d7d9651265 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -108,6 +108,7 @@
         </activity>
 
         <activity android:name="com.android.calendar.event.EditEventActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/Base.CalendarAppThemeWithActionBar">
         </activity>