diff --git a/F-Droid/AndroidManifest.xml b/F-Droid/AndroidManifest.xml
index 402629bd5..d798d09f7 100644
--- a/F-Droid/AndroidManifest.xml
+++ b/F-Droid/AndroidManifest.xml
@@ -288,7 +288,9 @@
             android:theme="@style/SwapTheme.Wizard.ReceiveSwap"
             android:label=""
             android:noHistory="true"
-            android:parentActivityName=".FDroid">
+            android:parentActivityName=".FDroid"
+            android:screenOrientation="portrait"
+            android:configChanges="orientation|keyboardHidden">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".FDroid" />
@@ -386,7 +388,9 @@
             android:label="@string/menu_swap"
             android:name=".views.swap.SwapActivity"
             android:parentActivityName=".FDroid"
-            android:theme="@style/SwapTheme.Wizard">
+            android:theme="@style/SwapTheme.Wizard"
+            android:screenOrientation="portrait"
+            android:configChanges="orientation|keyboardHidden">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".FDroid" />
@@ -395,7 +399,9 @@
             android:label="@string/swap"
             android:name=".views.swap.SwapAppListActivity"
             android:parentActivityName=".FDroid"
-            android:theme="@style/SwapTheme.AppList">
+            android:theme="@style/SwapTheme.AppList"
+            android:screenOrientation="portrait"
+            android:configChanges="orientation|keyboardHidden">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".FDroid" />