diff --git a/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.kt b/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.kt
index 0d7dfd2180..a346332012 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.kt
@@ -46,6 +46,10 @@ class SearchActivity : BaseActivity(), MediaDetailProvider, CategoryImagesCallba
     private var viewPagerAdapter: ViewPagerAdapter? = null
     private var binding: ActivitySearchBinding? = null
 
+    //constant and variable to track the the current media item for state restoration
+    private val MEDIA_DETAILS_POSITION = "media_details_position"
+    private var currentMediaPosition: Int = -1
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivitySearchBinding.inflate(layoutInflater)
@@ -66,6 +70,17 @@ class SearchActivity : BaseActivity(), MediaDetailProvider, CategoryImagesCallba
         binding!!.searchBox.queryHint = getString(R.string.search_commons)
         binding!!.searchBox.onActionViewExpanded()
         binding!!.searchBox.clearFocus()
+
+        //restore media details if a position was saved before rotation
+        if (savedInstanceState != null) {
+            currentMediaPosition = savedInstanceState.getInt(MEDIA_DETAILS_POSITION, -1)
+            if (currentMediaPosition != -1) {
+                //us e post to ensure the UI is laid out before opening the media details
+                binding!!.root.post {
+                    onMediaClicked(currentMediaPosition)
+                }
+            }
+        }
     }
 
     /**
@@ -171,6 +186,7 @@ class SearchActivity : BaseActivity(), MediaDetailProvider, CategoryImagesCallba
      * @param position item index that should be opened
      */
     override fun onMediaClicked(position: Int) {
+        currentMediaPosition = position //track the position for state restoration
         hideKeyboard(findViewById(R.id.searchBox))
         binding!!.tabLayout.visibility = View.GONE
         binding!!.viewPager.visibility = View.GONE
@@ -183,7 +199,7 @@ class SearchActivity : BaseActivity(), MediaDetailProvider, CategoryImagesCallba
             supportFragmentManager!!
                 .beginTransaction()
                 .hide(supportFragmentManager!!.fragments[supportFragmentManager!!.backStackEntryCount])
-                .add(R.id.mediaContainer, mediaDetails!!)
+                .add(R.id.mediaContainer, mediaDetails!!, "MEDIA_DETAIL_TAG")
                 .addToBackStack(null)
                 .commit()
             // Reason for using hide, add instead of replace is to maintain scroll position after
@@ -195,15 +211,14 @@ class SearchActivity : BaseActivity(), MediaDetailProvider, CategoryImagesCallba
     }
 
     /**
-     * This method is called on Screen Rotation
+     * Save current search activity state
      */
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putInt(MEDIA_DETAILS_POSITION, currentMediaPosition)
+    }
+
     override fun onResume() {
-        if (supportFragmentManager!!.backStackEntryCount == 1) {
-            //FIXME: Temporary fix for screen rotation inside media details. If we don't call onBackPressed then fragment stack is increasing every time.
-            //FIXME: Similar issue like this https://github.com/commons-app/apps-android-commons/issues/894
-            // This is called on screen rotation when user is inside media details. Ideally it should show Media Details but since we are not saving the state now. We are throwing the user to search screen otherwise the app was crashing.
-            onBackPressed()
-        }
         super.onResume()
     }
 
@@ -224,6 +239,7 @@ class SearchActivity : BaseActivity(), MediaDetailProvider, CategoryImagesCallba
         }
         if (getSupportFragmentManager().backStackEntryCount == 1) {
             // back to search so show search toolbar and hide navigation toolbar
+            currentMediaPosition = -1 //reset tracking position when returning to search list
             binding!!.searchBox.visibility = View.VISIBLE //set the searchview
             binding!!.tabLayout.visibility = View.VISIBLE
             binding!!.viewPager.visibility = View.VISIBLE
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.kt
index d1e1d2aad1..c9aee73c23 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.kt
@@ -114,9 +114,10 @@ class MediaDetailPagerFragment : CommonsDaggerSupportFragment(), OnPageChangeLis
         binding!!.mediaDetailsPager.adapter = adapter
 
         if (savedInstanceState != null) {
-            val pageNumber = savedInstanceState.getInt("current-page")
-            binding!!.mediaDetailsPager.setCurrentItem(pageNumber, false)
-            requireActivity().invalidateOptionsMenu()
+            val savedPosition = savedInstanceState.getInt("current-page", -1)
+            if (savedPosition != -1) {
+                binding!!.mediaDetailsPager.currentItem = savedPosition
+            }
         }
         adapter!!.notifyDataSetChanged()
 
@@ -125,16 +126,24 @@ class MediaDetailPagerFragment : CommonsDaggerSupportFragment(), OnPageChangeLis
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putInt("current-page", binding!!.mediaDetailsPager.currentItem)
-        outState.putBoolean("editable", editable)
-        outState.putBoolean("isFeaturedImage", isFeaturedImage)
+        // save the current item position so it can be restored after rotation
+        if (binding != null) {
+            outState.putInt("current-page", binding!!.mediaDetailsPager.currentItem)
+        }
+        // save these so they aren't lost if the process is killed
+        outState.putBoolean("is_editable", editable)
+        outState.putBoolean("is_featured_image", isFeaturedImage)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        //use arguments for initial creation, savedInstanceState for restoration
         if (savedInstanceState != null) {
-            editable = savedInstanceState.getBoolean("editable", false)
-            isFeaturedImage = savedInstanceState.getBoolean("isFeaturedImage", false)
+            editable = savedInstanceState.getBoolean("is_editable", false)
+            isFeaturedImage = savedInstanceState.getBoolean("is_featured_image", false)
+        } else {
+            editable = arguments?.getBoolean("is_editable") ?: false
+            isFeaturedImage = arguments?.getBoolean("is_featured_image") ?: false
         }
         setHasOptionsMenu(true)
         initProvider()