diff --git a/src/mathediting.js b/src/mathediting.js
index 6c0b10c6c..61a7c99a1 100644
--- a/src/mathediting.js
+++ b/src/mathediting.js
@@ -124,7 +124,7 @@ export default class MathEditing extends Plugin {
 			const uiElement = viewWriter.createUIElement( 'div', null, function( domDocument ) {
 				const domElement = this.toDomElement( domDocument );
 
-				renderEquation( equation, domElement, mathConfig.engine, display );
+				renderEquation( equation, domElement, mathConfig.engine, display, false );
 
 				return domElement;
 			} );
diff --git a/src/mathui.js b/src/mathui.js
index 73300a951..90ec46437 100644
--- a/src/mathui.js
+++ b/src/mathui.js
@@ -105,9 +105,10 @@ export default class MathUI extends Plugin {
 
 		// Show preview element
 		const elId = 'math-preview';
-		let prewviewEl = document.getElementById( elId );// eslint-disable-line
-		if ( prewviewEl ) {
-			prewviewEl.style.display = 'block';
+		let prewviewEl = document.getElementById( elId ); // eslint-disable-line
+		if ( prewviewEl && this._form.previewEnabled ) {
+			// Force refresh preview
+			this._form.mathView.updateMath();
 		}
 
 		this._form.equation = mathCommand.value || '';
diff --git a/src/ui/mathview.js b/src/ui/mathview.js
index a7baf4726..063b05004 100644
--- a/src/ui/mathview.js
+++ b/src/ui/mathview.js
@@ -12,7 +12,9 @@ export default class MathView extends View {
 		this.set( 'display', false );
 
 		this.on( 'change', () => {
-			this.updateMath();
+			if ( this.isRendered ) {
+				this.updateMath();
+			}
 		} );
 
 		this.setTemplate( {
@@ -27,10 +29,7 @@ export default class MathView extends View {
 	}
 
 	updateMath() {
-		const el = this.element;
-		if ( el ) {
-			renderEquation( this.value, el, this.engine, this.display, true );
-		}
+		renderEquation( this.value, this.element, this.engine, this.display, true );
 	}
 
 	render() {
diff --git a/src/utils.js b/src/utils.js
index a4b5c412f..51f504d78 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -21,6 +21,7 @@ export function renderEquation( equation, element, engine = 'katex', display = f
 			selectRenderMode( element, preview, el => {
 				renderMathJax3( equation, el, display, () => {
 					if ( preview ) {
+						el.style.display = 'block';
 						moveAndScaleElement( element, el );
 					}
 				} );
@@ -36,6 +37,7 @@ export function renderEquation( equation, element, engine = 'katex', display = f
 					if ( preview ) {
 						// eslint-disable-next-line
 						MathJax.Hub.Queue( () => {
+							el.style.display = 'block';
 							moveAndScaleElement( element, el );
 						} );
 					}
@@ -49,6 +51,7 @@ export function renderEquation( equation, element, engine = 'katex', display = f
 				displayMode: display
 			} );
 			if ( preview ) {
+				el.style.display = 'block';
 				moveAndScaleElement( element, el );
 			}
 		} );
@@ -72,7 +75,6 @@ function selectRenderMode( element, preview, cb ) {
 }
 
 function renderMathJax3( equation, element, display, after ) {
-	const options = MathJax.getMetricsFor( element, display );
 	let promiseFunction = undefined;
 	if ( typeof MathJax.tex2chtmlPromise !== 'undefined' ) {
 		promiseFunction = MathJax.tex2chtmlPromise;
@@ -81,12 +83,11 @@ function renderMathJax3( equation, element, display, after ) {
 	}
 
 	if ( typeof promiseFunction !== 'undefined' ) {
-		promiseFunction( equation, options ).then( node => {
+		promiseFunction( equation, { display } ).then( node => {
 			if ( element.firstChild ) {
-				element.firstChild.replaceWith( node );
-			} else {
-				element.appendChild( node );
+				element.removeChild( element.firstChild );
 			}
+			element.appendChild( node );
 			after();
 		} );
 	}
@@ -135,24 +136,25 @@ export function getPreviewElement( element ) {
 	return prewviewEl;
 }
 
-function moveAndScaleElement( parent, element ) {
-	moveElement( parent, element );
+function moveAndScaleElement( parent, child ) {
+	// Move to right place
+	moveElement( parent, child );
 
 	// Scale parent element same as preview
-	const domRect = element.getBoundingClientRect();
+	const domRect = child.getBoundingClientRect();
 	parent.style.width = domRect.width + 'px';
 	parent.style.height = domRect.height + 'px';
 }
 
-function moveElement( parent, element ) {
+function moveElement( parent, child ) {
 	const domRect = parent.getBoundingClientRect();
 	const left = window.scrollX + domRect.left; // eslint-disable-line
 	const top = window.scrollY + domRect.top; // eslint-disable-line
-	element.style.position = 'absolute';
-	element.style.left = left + 'px';
-	element.style.top = top + 'px';
-	element.style.zIndex = 'var(--ck-z-modal)';
-	element.style.pointerEvents = 'none';
+	child.style.position = 'absolute';
+	child.style.left = left + 'px';
+	child.style.top = top + 'px';
+	child.style.zIndex = 'var(--ck-z-modal)';
+	child.style.pointerEvents = 'none';
 }
 
 // Simple MathJax 3 version check