diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e6b56c92d..633440e5e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -118,8 +118,8 @@
 
         <activity
             android:name=".activities.PanoramaActivity"
-            android:theme="@style/FullScreenTheme"
-            android:configChanges="orientation|keyboardHidden|screenSize"/>
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@style/FullScreenTheme"/>
 
         <activity
             android:name=".activities.IncludedFoldersActivity"
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PanoramaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PanoramaActivity.kt
index b0bc312ef..95bb992ae 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PanoramaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PanoramaActivity.kt
@@ -1,5 +1,6 @@
 package com.simplemobiletools.gallery.activities
 
+import android.content.res.Configuration
 import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.view.View
@@ -13,6 +14,7 @@ import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.extensions.hideSystemUI
 import com.simplemobiletools.gallery.extensions.navigationBarHeight
+import com.simplemobiletools.gallery.extensions.navigationBarWidth
 import com.simplemobiletools.gallery.extensions.showSystemUI
 import com.simplemobiletools.gallery.helpers.PATH
 import kotlinx.android.synthetic.main.activity_panorama.*
@@ -29,8 +31,7 @@ open class PanoramaActivity : SimpleActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_panorama)
         supportActionBar?.hide()
-        (cardboard.layoutParams as RelativeLayout.LayoutParams).bottomMargin = navigationBarHeight
-        (explore.layoutParams as RelativeLayout.LayoutParams).bottomMargin = navigationBarHeight
+        setupButtonMargins()
 
         cardboard.setOnClickListener {
             panorama_view.displayMode = CARDBOARD_DISPLAY_MODE
@@ -110,6 +111,20 @@ open class PanoramaActivity : SimpleActivity() {
         }
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration?) {
+        super.onConfigurationChanged(newConfig)
+        setupButtonMargins()
+    }
+
+    private fun setupButtonMargins() {
+        (cardboard.layoutParams as RelativeLayout.LayoutParams).apply {
+            bottomMargin = navigationBarHeight
+            rightMargin = navigationBarWidth
+        }
+
+        (explore.layoutParams as RelativeLayout.LayoutParams).bottomMargin = navigationBarHeight
+    }
+
     private fun toggleButtonVisibility() {
         cardboard.animate().alpha(if (isFullScreen) 0f else 1f)
         cardboard.isClickable = !isFullScreen