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 403ff443..dfa1a347 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
@@ -130,7 +130,9 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 
 				keyboard?.let {
 //					this.animateKeyboard(true)
-					this.showKeyboard(it)
+					this.showKeyboard(it) {
+						this.scrollToPosition(selection.index)
+					}
 //					this.keyboard.show(it)
 				} ?: run {
 					this.animateKeyboard(false)
@@ -139,6 +141,8 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 			} ?: run {
 				this.animateKeyboard(false)
 			}
+
+
 		}
 
 		val observer = Observer<MutableList<RowRepresentable>> {
@@ -254,8 +258,6 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 			refreshRowAtIndexAndCurrent(oldIndex)
 		}
 
-		this.scrollToPosition(position)
-
 		this.model.selectionLiveData.value = HHSelection(position, tag)
 
 	}
@@ -437,18 +439,18 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 	}
 
 
-	private fun showKeyboard(keyboard: HHKeyboard) {
+	private fun showKeyboard(keyboard: HHKeyboard, endHandler: (() -> (Unit))? = null) {
 
 		val lp = this.kbTopGuideline.layoutParams as ConstraintLayout.LayoutParams
 		if (lp.guideEnd == 0) {
-			this.animateKeyboard(true)
+			this.animateKeyboard(true, endHandler)
 		}
 		this.keyboard.show(keyboard)
 	}
 
-	private fun animateKeyboard(show: Boolean) {
+	private fun animateKeyboard(show: Boolean, endHandler: (() -> (Unit))? = null) {
 
-		val height = 300.0f.px
+		val height = 310.0f.px
 		val start = if (show) 0.0f else height
 		val end = if (show) height else 0.0f
 
@@ -464,6 +466,10 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 			lp.guideEnd = (it.animatedValue as Float).toInt()
 			// update layout params
 			this.kbTopGuideline.layoutParams = lp
+
+			if (lp.guideEnd == end.toInt()) {
+				endHandler?.invoke()
+			}
 		}
 		valueAnimator.start()
 	}
diff --git a/app/src/main/res/layout/view_hand_keyboard_action.xml b/app/src/main/res/layout/view_hand_keyboard_action.xml
index b880bd35..d0aba291 100644
--- a/app/src/main/res/layout/view_hand_keyboard_action.xml
+++ b/app/src/main/res/layout/view_hand_keyboard_action.xml
@@ -7,12 +7,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
+        android:id="@+id/toolbar"
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/positionRecyclerView">
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/closeButton"
@@ -31,14 +32,15 @@
         android:layout_weight="1"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/recyclerView"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
         tools:layout_height="44dp"
         />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
-        android:layout_height="200dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/positionRecyclerView"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/view_hand_keyboard_amount.xml b/app/src/main/res/layout/view_hand_keyboard_amount.xml
index 69a4af42..1364b2a3 100644
--- a/app/src/main/res/layout/view_hand_keyboard_amount.xml
+++ b/app/src/main/res/layout/view_hand_keyboard_amount.xml
@@ -55,7 +55,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
-        android:layout_height="240dp"
+        android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/view_hand_keyboard_card.xml b/app/src/main/res/layout/view_hand_keyboard_card.xml
index 4289ee0b..f5049d0e 100644
--- a/app/src/main/res/layout/view_hand_keyboard_card.xml
+++ b/app/src/main/res/layout/view_hand_keyboard_card.xml
@@ -5,12 +5,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
+        android:id="@+id/toolbar"
         android:orientation="horizontal"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/valueRecyclerView">
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/closeButton"