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 62ead680..373b806e 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
@@ -68,10 +68,10 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 		initUI()
 		this.edit()
 
-		this.model.selectionLiveData.value?.index?.let {
-			Timber.d(">>>> attempt to retrieveEditTextInputConnection")
-			this.retrieveEditTextInputConnection(it)
-		}
+//		this.model.selectionLiveData.value?.index?.let {
+//			Timber.d(">>>> attempt to retrieveEditTextInputConnection")
+//			this.retrieveEditTextInputConnection(it)
+//		}
 
 	}
 
@@ -107,13 +107,15 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 		this.model.selectionLiveData.observeForever { selection ->
 			selection?.let {
 				Timber.d("Current selection is ${selection.index} / ${selection.keyboard}")
-				retrieveEditTextInputConnection(selection.index)
 
 				when (it.keyboard) {
 					HHKeyboard.ACTION -> {
 						val positions = this.model.positionsForSelection()
 						this.keyboard.setPositions(positions)
 					}
+					HHKeyboard.AMOUNT -> {
+						retrieveEditTextInputConnection(selection.index)
+					}
 					else -> {}
 				}
 			} ?: run {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardAmountView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardAmountView.kt
index 93b9ffd6..5896bb8f 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardAmountView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardAmountView.kt
@@ -117,6 +117,7 @@ class KeyboardAmountView(context: Context) : AbstractKeyboardView(context),
 
 		editText.setText(amount?.noGroupingFormatted)
 //		editText.requestFocus()
+		editText.isEnabled = true // avoid crashes due to input connection null
 
 		editText.onCreateInputConnection(EditorInfo())?.let {
 			this.inputConnection = it