diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
index cd3e3bcaf..d72ef162b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
@@ -66,6 +66,7 @@ import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.visible
 import java.util.Locale
 import java.util.concurrent.TimeUnit
+import kotlin.math.roundToInt
 
 class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), MediaPreviewFragment.Events {
   private val TAG = Log.tag(MediaPreviewV2Fragment::class.java)
@@ -78,9 +79,12 @@ class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), Med
   private lateinit var fullscreenHelper: FullscreenHelper
   private lateinit var albumRailAdapter: MediaRailAdapter
 
+  private var individualItemWidth: Int = 0
+
   override fun onAttach(context: Context) {
     super.onAttach(context)
     fullscreenHelper = FullscreenHelper(requireActivity())
+    individualItemWidth = context.resources.getDimension(R.dimen.media_rail_item_size).roundToInt()
   }
 
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -293,19 +297,14 @@ class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), Med
     val currentItemPosition = albumRailAdapter.currentItemPosition
     val currentList = albumRailAdapter.currentList
     val albumRail: RecyclerView = binding.mediaPreviewPlaybackControls.recyclerView
-    var selectedItemWidth = -1
+    albumRail.scrollToPosition(currentItemPosition)
     for (i in currentList.indices) {
       val isSelected = i == currentItemPosition
       val stableId = albumRailAdapter.getItemId(i)
       val viewHolder = albumRail.findViewHolderForItemId(stableId) as? MediaRailAdapter.MediaRailViewHolder
-      if (viewHolder != null) {
-        viewHolder.setSelectedItem(isSelected)
-        if (isSelected) {
-          selectedItemWidth = viewHolder.itemView.width
-        }
-      }
+      viewHolder?.setSelectedItem(isSelected)
     }
-    val offsetFromStart = (albumRail.width - selectedItemWidth) / 2
+    val offsetFromStart = (albumRail.width - individualItemWidth) / 2
     val smoothScroller = OffsetSmoothScroller(requireContext(), offsetFromStart)
     smoothScroller.targetPosition = currentItemPosition
     val layoutManager = albumRail.layoutManager as LinearLayoutManager
diff --git a/app/src/main/res/layout/mediarail_media_item.xml b/app/src/main/res/layout/mediarail_media_item.xml
index 1cfaf8088..fbea9f72e 100644
--- a/app/src/main/res/layout/mediarail_media_item.xml
+++ b/app/src/main/res/layout/mediarail_media_item.xml
@@ -11,16 +11,15 @@
 
     <org.thoughtcrime.securesms.components.ThumbnailView
         android:id="@+id/rail_item_image"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
+        android:layout_width="@dimen/media_rail_thumbnail_size"
+        android:layout_height="@dimen/media_rail_thumbnail_size"
         android:layout_gravity="center"
-        android:background="@drawable/mediarail_media_outline"
         app:thumbnail_radius="8dp"/>
 
     <ImageView
         android:id="@+id/rail_item_outline"
-        android:layout_width="46dp"
-        android:layout_height="46dp"
+        android:layout_width="@dimen/media_rail_item_size"
+        android:layout_height="@dimen/media_rail_item_size"
         android:layout_gravity="center"
         android:src="@drawable/mediarail_media_outline"
         android:visibility="gone"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 51dd3839b..a3a826940 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -244,4 +244,5 @@
     <dimen name="media_preview_button_horizontal_margin">8dp</dimen>
     <dimen name="media_preview_lottie_button_dimen">36dp</dimen>
     <dimen name="media_rail_item_size">46dp</dimen>
+    <dimen name="media_rail_thumbnail_size">44dp</dimen>
 </resources>