diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 659786e1..1df0b780 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -103,7 +103,8 @@
             android:configChanges="orientation|screenSize" />
         <activity
             android:name=".ViewMediaActivity"
-            android:theme="@style/TuskyBaseTheme" />
+            android:theme="@style/TuskyBaseTheme"
+            android:configChanges="orientation|screenSize|keyboardHidden|screenLayout|smallestScreenSize" />
         <activity
             android:name=".components.account.AccountActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|screenLayout|smallestScreenSize" />
diff --git a/app/src/main/java/com/keylesspalace/tusky/view/ExposedPlayPauseVideoView.kt b/app/src/main/java/com/keylesspalace/tusky/view/ExposedPlayPauseVideoView.kt
index 444e71dc..95605b18 100644
--- a/app/src/main/java/com/keylesspalace/tusky/view/ExposedPlayPauseVideoView.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/view/ExposedPlayPauseVideoView.kt
@@ -12,6 +12,7 @@ class ExposedPlayPauseVideoView @JvmOverloads constructor(
     VideoView(context, attrs, defStyleAttr) {
 
     private var listener: PlayPauseListener? = null
+    private var playing = false
 
     fun setPlayPauseListener(listener: PlayPauseListener) {
         this.listener = listener
@@ -19,12 +20,18 @@ class ExposedPlayPauseVideoView @JvmOverloads constructor(
 
     override fun start() {
         super.start()
-        listener?.onPlay()
+        if (!playing) {
+            playing = true
+            listener?.onPlay()
+        }
     }
 
     override fun pause() {
         super.pause()
-        listener?.onPause()
+        if (playing) {
+            playing = false
+            listener?.onPause()
+        }
     }
 
     interface PlayPauseListener {