diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt
index 93c1f1d1..97b2b73d 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt
@@ -87,6 +87,14 @@ class KeyboardActionView(context: Context) : AbstractKeyboardView(context),
 	}
 
 	fun setAvailableActions(availableActions: Set<Action.Type>) {
+
+		val displayedTypes = Action.Type.defaultTypes
+		availableActions.forEach {
+			if (!displayedTypes.contains(it)) {
+				throw PAIllegalStateException("Displayed actions does not contain $it, can't be shown")
+			}
+		}
+
 		this.availableActions = availableActions
 		this.dataAdapter.notifyDataSetChanged()
 	}