diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 16bbd3bae..0dd19c4c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -103,7 +103,6 @@
         <activity android:name=".ViewTagActivity" />
         <activity
             android:name=".ViewMediaActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
             android:theme="@style/TuskyBaseTheme" />
         <activity
             android:name=".AccountActivity"
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
index fd907c205..340361072 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
@@ -50,7 +50,7 @@ class ViewVideoFragment : ViewMediaFragment() {
     override fun setUserVisibleHint(isVisibleToUser: Boolean) {
         // Start/pause/resume video playback as fragment is shown/hidden
         super.setUserVisibleHint(isVisibleToUser)
-        if (videoPlayer == null) {
+        if (videoView == null) {
             return
         }
 
@@ -58,10 +58,10 @@ class ViewVideoFragment : ViewMediaFragment() {
             if (mediaActivity.isToolbarVisible) {
                 handler.postDelayed(hideToolbar, TOOLBAR_HIDE_DELAY_MS)
             }
-            videoPlayer.start()
+            videoView.start()
         } else {
             handler.removeCallbacks(hideToolbar)
-            videoPlayer.pause()
+            videoView.pause()
             mediaController.hide()
         }
     }
@@ -69,18 +69,31 @@ class ViewVideoFragment : ViewMediaFragment() {
     @SuppressLint("ClickableViewAccessibility")
     override fun setupMediaView(url: String, previewUrl: String?) {
         descriptionView = mediaDescription
-        val videoView = videoPlayer
+
         videoView.transitionName = url
         videoView.setVideoPath(url)
         mediaController = MediaController(mediaActivity)
-        mediaController.setMediaPlayer(videoPlayer)
-        videoPlayer.setMediaController(mediaController)
+        mediaController.setMediaPlayer(videoView)
+        videoView.setMediaController(mediaController)
         videoView.requestFocus()
         videoView.setOnTouchListener { _, _ ->
             mediaActivity.onPhotoTap()
             false
         }
         videoView.setOnPreparedListener { mp ->
+            val containerWidth = videoContainer.measuredWidth.toFloat()
+            val containerHeight = videoContainer.measuredHeight.toFloat()
+            val videoWidth = mp.videoWidth.toFloat()
+            val videoHeight = mp.videoHeight.toFloat()
+
+            if(containerWidth/containerHeight > videoWidth/videoHeight) {
+                videoView.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+                videoView.layoutParams.width = ViewGroup.LayoutParams.WRAP_CONTENT
+            } else {
+                videoView.layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
+                videoView.layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT
+            }
+
             progressBar.hide()
             mp.isLooping = true
             if (arguments!!.getBoolean(ARG_START_POSTPONED_TRANSITION)) {
@@ -117,7 +130,7 @@ class ViewVideoFragment : ViewMediaFragment() {
     }
 
     override fun onToolbarVisibilityChange(visible: Boolean) {
-        if (videoPlayer == null || !userVisibleHint) {
+        if (videoView == null || !userVisibleHint) {
             return
         }
 
diff --git a/app/src/main/res/layout/fragment_view_video.xml b/app/src/main/res/layout/fragment_view_video.xml
index 3c8afbce4..0247a9cb3 100644
--- a/app/src/main/res/layout/fragment_view_video.xml
+++ b/app/src/main/res/layout/fragment_view_video.xml
@@ -1,46 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_gravity="center"
+    android:id="@+id/videoContainer"
     android:clickable="true"
     android:focusable="true">
 
-    <VideoView
-        android:id="@+id/videoPlayer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_gravity="center"
-        />
-
     <TextView
         android:id="@+id/mediaDescription"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="?attr/actionBarSize"
-        app:layout_constraintTop_toTopOf="parent"
         android:background="#60000000"
         android:lineSpacingMultiplier="1.1"
         android:padding="8dp"
         android:textAlignment="center"
         android:textColor="#eee"
         android:textSize="?attr/status_text_medium"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="Some media description" />
 
+    <VideoView
+        android:id="@+id/videoView"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <ProgressBar
         android:id="@+id/progressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_gravity="center" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file