diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorFragment.kt
index 8f6a16ff..c51ab369 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorFragment.kt
@@ -575,12 +575,10 @@ class EditorFragment : RealmFragment(), RowRepresentableDelegate, KeyboardListen
 	 */
 	override fun positionSelected(position: Position) {
 		val rowRepresentableIndex = this.model.nextActionIndexForPosition(position)
-		this.model.rowRepresentableForPosition(rowRepresentableIndex)?.let {
-			onRowSelected(rowRepresentableIndex, it, ComputedAction.Tag.ACTION.ordinal)
-			this.editorAdapter.notifyItemChanged(rowRepresentableIndex)
-			this.scrollToPosition(rowRepresentableIndex)
-		}
-			?: throw PAIllegalStateException("RowRepresentable not found at index $rowRepresentableIndex")
+		val row = this.model.rowRepresentableForPosition(rowRepresentableIndex)
+		onRowSelected(rowRepresentableIndex, row, ComputedAction.Tag.ACTION.ordinal)
+		this.editorAdapter.notifyItemChanged(rowRepresentableIndex)
+		this.scrollToPosition(rowRepresentableIndex)
 	}
 
 	// Table