diff --git a/index.html b/index.html
index b9d563d07..777fbc4e7 100755
--- a/index.html
+++ b/index.html
@@ -13,7 +13,7 @@
   </style>
   <body>
     <div id="gjs" style="height:0px; overflow:hidden;">
-      <div>Some TEXT</div>
+      <div style="float:right; width: 100px;">Test text</div>
       <header class="header-banner">
         <div class="container-width">
           <div class="logo-container">
diff --git a/src/rich_text_editor/index.js b/src/rich_text_editor/index.js
index 38de63886..242f7d60b 100644
--- a/src/rich_text_editor/index.js
+++ b/src/rich_text_editor/index.js
@@ -122,7 +122,14 @@ module.exports = () => {
       var pos = canvas.getTargetToElementDim(toolbar.el, this.lastEl, {
         event: 'rteToolbarPosUpdate',
       });
-      console.log(pos);
+
+      if (c.adjustToolbar) {
+        // Move the toolbar down when the top canvas edge is reached
+        if (pos.top <= pos.canvasTop) {
+          pos.top = pos.elementTop + pos.elementHeight;
+        }
+      }
+
       var toolbarStyle = toolbar.el.style;
       toolbarStyle.top = pos.top + u;
       toolbarStyle.left = pos.left + u;
