diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt
index d2feae29..06680c6c 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt
@@ -15,7 +15,7 @@ class BottomSheetEditTextMultiLinesFragment : BottomSheetFragment() {
     private var _binding: BottomSheetEditTextMultiLinesBinding? = null
     private val binding get() = _binding!!
 
-    override fun inflateContentView(inflater: LayoutInflater, container: ViewGroup): View? {
+    override fun inflateContentView(inflater: LayoutInflater, container: ViewGroup): View {
         _binding = BottomSheetEditTextMultiLinesBinding.inflate(inflater, container, true)
         return binding.root
     }
@@ -32,7 +32,12 @@ class BottomSheetEditTextMultiLinesFragment : BottomSheetFragment() {
 
 	override fun onStart() {
 		super.onStart()
-		binding.editText.requestFocus()
+
+		val data = getDescriptors() ?: throw RowRepresentableEditDescriptorException("RowRepresentableEditDescriptor not found")
+		if (data[0].defaultValue.toString().isEmpty()) {
+			binding.editText.requestFocus()
+		}
+
 	}
 
 	/**