diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d833681a..cdc6655f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -74,7 +74,8 @@
         <activity
             android:name="net.pokeranalytics.android.ui.activity.HandHistoryActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateAlwaysHidden"/>
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.BankrollDetailsActivity"
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/HandHistoryAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/HandHistoryAdapter.kt
index 43310ef9..cba70943 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/HandHistoryAdapter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/HandHistoryAdapter.kt
@@ -1,14 +1,12 @@
 package net.pokeranalytics.android.ui.adapter
 
 import android.app.Activity
-import android.content.Context
 import android.content.res.ColorStateList
 import android.text.InputType
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
 import android.widget.Button
 import android.widget.EditText
 import androidx.recyclerview.widget.RecyclerView
@@ -224,11 +222,13 @@ class HandHistoryAdapter(
 		}
 
 		private fun requestFocusAndShowKeyboard(editText: EditText) {
-			editText.requestFocus()
 
 			if (editText.requestFocus()) {
-				val imm = itemView.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-				imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0)
+//				val imm = itemView.context.getSystemService(InputMethodManager::class.java)
+//				imm.toggleSoftInput(0, InputMethodManager.HIDE_IMPLICIT_ONLY)
+
+//				val imm = itemView.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+//				imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0)
 //				imm.showSoftInput(editText, InputMethodManager.SHOW_IMPLICIT)
 			}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt b/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt
index c48d1fc8..3a9736ee 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt
@@ -210,7 +210,6 @@ fun Bitmap.toByteArray() : ByteArray {
 fun Activity.hideKeyboard() {
 	this.currentFocus?.let {
 		val imm = getSystemService(InputMethodManager::class.java)
-//		imm.showSoftInput()
 		imm.hideSoftInputFromWindow(it.windowToken, 0)
 	}
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HandHistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HandHistoryFragment.kt
index ad120c19..476b16cf 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HandHistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HandHistoryFragment.kt
@@ -240,7 +240,6 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDataSource, RowRepr
 
 	override fun amountKeyTyped(key: NumericKey) {
 		this.model.amountKeyTyped(key)
-		TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 	}
 
 	// Table refresh
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 840285c6..a0d4198c 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="200dp"
+        android:layout_height="240dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"