diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
index e2c767dd..8963a064 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
@@ -518,8 +518,9 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 	override fun positionSelected(position: Position) {
 		val rowRepresentableIndex = this.model.nextActionIndexForPosition(position)
 		this.model.rowRepresentableForPosition(rowRepresentableIndex)?.let {
-			onRowSelected(rowRepresentableIndex, it, HHKeyboard.ACTION.ordinal)
+			onRowSelected(rowRepresentableIndex, it, ComputedAction.Tag.ACTION.ordinal)
 			this.handHistoryAdapter.notifyItemChanged(rowRepresentableIndex)
+			this.scrollToPosition(rowRepresentableIndex)
 		} ?: throw PAIllegalStateException("Rowrepresentable not fouind at index $rowRepresentableIndex")
 	}
 
diff --git a/app/src/main/res/layout/row_bottom_sheet_grid_title.xml b/app/src/main/res/layout/row_bottom_sheet_grid_title.xml
index aad2d5ea..67609344 100644
--- a/app/src/main/res/layout/row_bottom_sheet_grid_title.xml
+++ b/app/src/main/res/layout/row_bottom_sheet_grid_title.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/container"