diff --git a/protected/humhub/docs/CHANGELOG.md b/protected/humhub/docs/CHANGELOG.md
index 186448bcf2..b974372838 100644
--- a/protected/humhub/docs/CHANGELOG.md
+++ b/protected/humhub/docs/CHANGELOG.md
@@ -8,6 +8,8 @@ HumHub Change Log
 - Fix (CVE-2019-9093) and (CVE-2019-9094): Reflective XSS in file post upload and cfiles upload (thanks to **Rubal Jain** for testing and reporting)
 - Enh: Added further upload file name validation
 - Enh: Added `ContentContainerModuleManager::flushCache()`
+- Fix: Bootstrap modal blocks richtext prompt focus
+
 
 1.3.10  (February 22, 2019)
 ---------------------------
diff --git a/static/js/humhub/humhub.ui.modal.js b/static/js/humhub/humhub.ui.modal.js
index fd0e064f00..538c60c92f 100644
--- a/static/js/humhub/humhub.ui.modal.js
+++ b/static/js/humhub/humhub.ui.modal.js
@@ -581,6 +581,10 @@ humhub.module('ui.modal', function (module, require, $) {
                     return true;
                 }
 
+                if($target.closest('.ProseMirror-prompt').length) {
+                    return true;
+                }
+
                 // Allow stacking of modals
                 if ($target.closest('.modal.in').length) {
                     return true;