diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 796be4754..8b41fb872 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -124,7 +124,8 @@
 
         <activity
             android:name=".activities.VideoPlayerActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"/>
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:parentActivityName=".activities.MediaActivity"/>
 
         <activity
             android:name=".activities.PanoramaPhotoActivity"
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt
index 4ac9735d7..19ccea60f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt
@@ -25,10 +25,8 @@ import kotlinx.android.synthetic.main.activity_video_player.*
 import java.io.File
 
 open class VideoPlayerActivity : SimpleActivity(), ViewPagerFragment.FragmentListener {
-
     private var mMedium: Medium? = null
     private var mIsFullScreen = false
-    private var mCurrentOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR
     private var mFragment: ViewPagerFragment? = null
     private var mUri: Uri? = null
 
@@ -100,15 +98,18 @@ open class VideoPlayerActivity : SimpleActivity(), ViewPagerFragment.FragmentLis
         }
 
         when (item.itemId) {
-            R.id.menu_force_portrait -> forceOrientation(true)
-            R.id.menu_force_landscape -> forceOrientation(false)
+            R.id.menu_change_orientation -> changeOrientation()
             else -> return super.onOptionsItemSelected(item)
         }
         return true
     }
 
-    private fun forceOrientation(portrait: Boolean) {
-
+    private fun changeOrientation() {
+        requestedOrientation = if (resources.configuration.orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
+            ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+        } else {
+            ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+        }
     }
 
     override fun fragmentClicked() {
diff --git a/app/src/main/res/menu/menu_video_player.xml b/app/src/main/res/menu/menu_video_player.xml
index 38daa699e..00e818ca3 100644
--- a/app/src/main/res/menu/menu_video_player.xml
+++ b/app/src/main/res/menu/menu_video_player.xml
@@ -2,14 +2,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/menu_force_portrait"
-        android:icon="@drawable/ic_orientation_portrait"
-        android:title="@string/force_portrait"
-        app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/menu_force_landscape"
-        android:icon="@drawable/ic_orientation_landscape"
-        android:title="@string/force_landscape"
+        android:id="@+id/menu_change_orientation"
+        android:icon="@drawable/ic_orientation_auto"
+        android:title="@string/change_orientation"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_share"