diff --git a/entry_types/scrolled/package/src/frontend/Figure.js b/entry_types/scrolled/package/src/frontend/Figure.js
index aaa30bebfc..ebade077f4 100644
--- a/entry_types/scrolled/package/src/frontend/Figure.js
+++ b/entry_types/scrolled/package/src/frontend/Figure.js
@@ -61,7 +61,6 @@ export function Figure({
                          onChange={onCaptionChange}
                          onlyParagraphs={true}
                          hyphens="none"
-                         floatingControlsPosition="above"
                          placeholder={t('pageflow_scrolled.inline_editing.type_text')} />
          </figcaption>}
       </figure>
diff --git a/entry_types/scrolled/package/src/frontend/inlineEditing/EditableText/index.js b/entry_types/scrolled/package/src/frontend/inlineEditing/EditableText/index.js
index 3c00c7ca31..3979e9f286 100644
--- a/entry_types/scrolled/package/src/frontend/inlineEditing/EditableText/index.js
+++ b/entry_types/scrolled/package/src/frontend/inlineEditing/EditableText/index.js
@@ -60,7 +60,7 @@ export const EditableText = React.memo(function EditableText({
   value, contentElementId, placeholder, onChange, selectionRect, className,
   placeholderClassName, scaleCategory = 'body', typographyVariant, typographySize,
   autoFocus,
-  floatingControlsPosition = 'below'
+  floatingControlsPosition = 'above'
 }) {
   const editor = useMemo(
     () => withLinks(
diff --git a/entry_types/scrolled/package/src/frontend/inlineEditing/LinkTooltip.js b/entry_types/scrolled/package/src/frontend/inlineEditing/LinkTooltip.js
index d379d914b8..49240b1f9d 100644
--- a/entry_types/scrolled/package/src/frontend/inlineEditing/LinkTooltip.js
+++ b/entry_types/scrolled/package/src/frontend/inlineEditing/LinkTooltip.js
@@ -78,8 +78,7 @@ export function LinkPreview({href, openInNewTab, children, className}) {
     <span ref={ref}
           className={className}
           onMouseEnter={() => activate(href, openInNewTab, ref)}
-          onMouseLeave={deactivate}
-          onMouseDown={deactivate}>
+          onMouseLeave={deactivate}>
       {children}
     </span>
   );
@@ -96,6 +95,7 @@ export function LinkTooltip({disabled, position, align, state}) {
     <div className={classNames(styles.linkTooltip,
                                styles[`position-${position}`],
                                styles[`align-${align}`])}
+         onClick={e => e.stopPropagation()}
          onMouseEnter={keep}
          onMouseLeave={deactivate}
          style={{top: state.top, bottom: state.bottom, left: state.left}}>