diff --git a/app/src/main/java/com/fastaccess/github/ui/modules/issuesprs/edit/EditIssuePrFragment.kt b/app/src/main/java/com/fastaccess/github/ui/modules/issuesprs/edit/EditIssuePrFragment.kt
index 8e491134..07c7ad29 100644
--- a/app/src/main/java/com/fastaccess/github/ui/modules/issuesprs/edit/EditIssuePrFragment.kt
+++ b/app/src/main/java/com/fastaccess/github/ui/modules/issuesprs/edit/EditIssuePrFragment.kt
@@ -54,16 +54,19 @@ class EditIssuePrFragment : BaseFragment() {
         toolbar.inflateMenu(R.menu.submit_menu)
         toolbar.setNavigationOnClickListener { activity?.onBackPressed() }
 
+        viewModel.templateLiveData.observeNotNull(this) {
+            if (model.description.isNullOrEmpty()) {
+                model.description = it
+                descriptionEditText.post { markwon.setMarkdown(descriptionEditText, it) }
+            }
+        }
+
         if (savedInstanceState == null) {
             titleEditText.setText(model.title)
             val description = model.description
             if (!description.isNullOrEmpty()) {
                 descriptionEditText.post { markwon.setMarkdown(descriptionEditText, description) }
             } else {
-                viewModel.templateLiveData.observeNotNull(this) {
-                    model.description = it
-                    descriptionEditText.post { markwon.setMarkdown(descriptionEditText, it) }
-                }
                 viewModel.loadTemplate(model.login, model.repo)
             }
         }