diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5a96efe87596ed4bd656718eff12d141451d8f69..703ced6b5036fb283ea4b96d2588f9cbeb589760 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -111,6 +111,7 @@
         </activity>
 
         <activity android:name="com.android.calendar.event.EditEventActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/Base.CalendarAppThemeWithActionBar">
         </activity>