diff --git a/src/figure/FigureStateActive.js b/src/figure/FigureStateActive.js
index 46415494..fdc00439 100644
--- a/src/figure/FigureStateActive.js
+++ b/src/figure/FigureStateActive.js
@@ -169,6 +169,7 @@ export default function ({ stateFactory, ActiveState, formTpl, formElement, inli
         const figurelem = this.widget.element;
         const $texarea = this.widget.$form.find('textarea#figcaption');
         texareaHTMLElem = $texarea[0];
+        texareaHTMLElem.style.minHeight = '2em';
         function outputsize() {
             figurelem.data('heigthCaptionInput', $texarea.height());
         }
diff --git a/src/mediaEditor/plugins/mediaAlignment/helper.js b/src/mediaEditor/plugins/mediaAlignment/helper.js
index c100aa1b..ecb811f1 100644
--- a/src/mediaEditor/plugins/mediaAlignment/helper.js
+++ b/src/mediaEditor/plugins/mediaAlignment/helper.js
@@ -82,13 +82,16 @@ export const positionFloat = function positionFloat(widget, position) {
     if (!context.featureFlags['FEATURE_FLAG_DISABLE_FIGURE_WIDGET'] && prevClassName !== className) {
         // Re-build Figure widget to toggle between inline/block
         const parent = searchRecurse(widget.element.bdy.rootElement.bdy, widget.serial);
-        // avoid changes on Figure in a prompt
-        if (parent.contentModel && parent.contentModel === 'inlineStatic') {
+        // If Figure is not in A-block (Prompt, TextReader PCI)
+        if (parent.contentModel === 'inlineStatic' || widget.$container.closest('.qti-customInteraction').length) {
             _.defer(() => {
                 widget.element.data('widget').refresh();
             });
             return;
         }
+        // If Figure is in A-block, text is inside '<p>'. When'<figure>' is added inside, this '<p>' tag gets split and a linebreak appears.
+        // here we change state to sleep-active so that the user will see that reflected in UI immediately.
+        // otherwise, he will see this linebreak only if he focuses text in this A-block again, or reopens the item.
         widget.element.data('widget').changeState('sleep');
         _.defer(() => {
             if (parent && parent.data('widget')) {