diff --git a/src/js/base/module/AirPopover.js b/src/js/base/module/AirPopover.js
index 873d821e7..379e82b0c 100644
--- a/src/js/base/module/AirPopover.js
+++ b/src/js/base/module/AirPopover.js
@@ -12,7 +12,7 @@ export default class AirPopover {
     this.ui = $.summernote.ui;
     this.options = context.options;
     this.events = {
-      'summernote.keyup summernote.mouseup summernote.scroll': () => {
+      'summernote.keyup summernote.mousedown summernote.scroll': () => {
         if (this.options.editing == true) {
           this.update();
         }
diff --git a/src/js/bs3/ui.js b/src/js/bs3/ui.js
index 300a810f8..a472205dd 100644
--- a/src/js/bs3/ui.js
+++ b/src/js/bs3/ui.js
@@ -203,14 +203,26 @@ const ui = {
       ui.editingArea([
         ui.airEditable(),
       ]),
-    ]) : ui.editor([
-      ui.toolbar(),
-      ui.editingArea([
-        ui.codable(),
-        ui.editable(),
-      ]),
-      ui.statusbar(),
-    ])).render();
+    ]) : (options.toolbarPosition == 'bottom' ?
+        ui.editor([
+          ui.editingArea([
+            ui.codable(),
+            ui.editable(),
+          ]),
+          ui.toolbar(),
+          ui.statusbar(),
+        ])
+      :
+        ui.editor([
+          ui.toolbar(),
+          ui.editingArea([
+            ui.codable(),
+            ui.editable(),
+          ]),
+          ui.statusbar(),
+        ])
+      )
+    ).render();
 
     $editor.insertAfter($note);
 
diff --git a/src/js/bs4/ui.js b/src/js/bs4/ui.js
index 4c05e9d33..022f15a34 100644
--- a/src/js/bs4/ui.js
+++ b/src/js/bs4/ui.js
@@ -206,14 +206,26 @@ const ui = {
       ui.editingArea([
         ui.airEditable(),
       ]),
-    ]) : ui.editor([
-      ui.toolbar(),
-      ui.editingArea([
-        ui.codable(),
-        ui.editable(),
-      ]),
-      ui.statusbar(),
-    ])).render();
+    ]) : (options.toolbarPosition == 'bottom' ?
+        ui.editor([
+          ui.editingArea([
+            ui.codable(),
+            ui.editable(),
+          ]),
+          ui.toolbar(),
+          ui.statusbar(),
+        ])
+      :
+        ui.editor([
+          ui.toolbar(),
+          ui.editingArea([
+            ui.codable(),
+            ui.editable(),
+          ]),
+          ui.statusbar(),
+        ])
+      )
+    ).render();
 
     $editor.insertAfter($note);