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