diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreBottomSheet.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreBottomSheet.kt
index 22ca06eb1e..502d9abca3 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/more/SessionLearnMoreBottomSheet.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.settings.devices.v2.more
 
+import android.content.DialogInterface
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
@@ -42,6 +43,8 @@ class SessionLearnMoreBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSh
 
     override val showExpanded = true
 
+    var onDismiss: (() -> Unit)? = null
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetSessionLearnMoreBinding {
         return BottomSheetSessionLearnMoreBinding.inflate(inflater, container, false)
     }
@@ -57,6 +60,11 @@ class SessionLearnMoreBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSh
         }
     }
 
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
+        onDismiss?.invoke()
+    }
+
     override fun invalidate() = withState(viewModel) { viewState ->
         super.invalidate()
         views.bottomSheetSessionLearnMoreTitle.text = viewState.title
@@ -65,11 +73,12 @@ class SessionLearnMoreBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSh
 
     companion object {
 
-        fun show(fragmentManager: FragmentManager, args: Args) {
+        fun show(fragmentManager: FragmentManager, args: Args): SessionLearnMoreBottomSheet {
             val bottomSheet = SessionLearnMoreBottomSheet()
             bottomSheet.isCancelable = true
             bottomSheet.setArguments(args)
             bottomSheet.show(fragmentManager, "SessionLearnMoreBottomSheet")
+            return bottomSheet
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt
index 2f671492e3..2f2a87e42c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt
@@ -62,12 +62,20 @@ class RenameSessionFragment :
     }
 
     private fun initEditText() {
-        views.renameSessionEditText.showKeyboard(andRequestFocus = true)
+        showKeyboard()
         views.renameSessionEditText.doOnTextChanged { text, _, _, _ ->
             viewModel.handle(RenameSessionAction.EditLocally(text.toString()))
         }
     }
 
+    private fun showKeyboard() {
+        views.renameSessionEditText.viewTreeObserver.addOnWindowFocusChangeListener { hasFocus ->
+            if (hasFocus) {
+                views.renameSessionEditText.showKeyboard(andRequestFocus = true)
+            }
+        }
+    }
+
     private fun initSaveButton() {
         views.renameSessionSave.debouncedClicks {
             viewModel.handle(RenameSessionAction.SaveModifications)
@@ -89,7 +97,13 @@ class RenameSessionFragment :
                 title = getString(R.string.device_manager_learn_more_session_rename_title),
                 description = getString(R.string.device_manager_learn_more_session_rename),
         )
-        SessionLearnMoreBottomSheet.show(childFragmentManager, args)
+        SessionLearnMoreBottomSheet
+                .show(childFragmentManager, args)
+                .apply {
+                    onDismiss = {
+                        showKeyboard()
+                    }
+                }
     }
 
     private fun observeViewEvents() {