diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetBlindsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetBlindsFragment.kt
index cd2fd118..6eaf122d 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetBlindsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetBlindsFragment.kt
@@ -3,10 +3,11 @@ package net.pokeranalytics.android.ui.fragment.components
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import android.view.inputmethod.EditorInfo
+import kotlinx.android.synthetic.main.bottom_sheet_blinds.*
 import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.realm.Session
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment
 
 class BottomSheetBlindsFragment : BottomSheetFragment() {
 
@@ -24,6 +25,11 @@ class BottomSheetBlindsFragment : BottomSheetFragment() {
 		dismiss()
 	}
 
+	override fun onStart() {
+		super.onStart()
+		smallBlind.requestFocus()
+	}
+
 	/**
 	 * Init data
 	 */
@@ -39,6 +45,13 @@ class BottomSheetBlindsFragment : BottomSheetFragment() {
 
 		LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_blinds, view?.bottomSheetContainer, true)
 
+		bigBlind.setOnEditorActionListener { v, actionId, event ->
+			if (actionId == EditorInfo.IME_ACTION_DONE) {
+				clickOnCheck()
+			}
+			true
+		}
+
 	}
 
 }
\ No newline at end of file