diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
index 3590eab3f4..3c6cc0b088 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
@@ -82,6 +82,10 @@ ve.ce.MWExtensionNode.prototype.generateContents = function () {
 ve.ce.MWExtensionNode.prototype.onParseSuccess = function ( deferred, response ) {
 	var data = response.visualeditor, contentNodes = $( data.content ).get();
 	deferred.resolve( contentNodes );
+	// Rerender after images load
+	this.$.find( 'img' ).on( 'load', ve.bind( function () {
+		this.emit( 'rerender' );
+	}, this ) );
 };
 
 /**
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWHieroNode.js b/modules/ve-mw/ce/nodes/ve.ce.MWHieroNode.js
index b0d041e176..4f12d4f9ec 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWHieroNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWHieroNode.js
@@ -33,18 +33,6 @@ ve.ce.MWHieroNode.static.name = 'mwHiero';
 
 ve.ce.MWHieroNode.static.tagName = 'div';
 
-/* Methods */
-
-/** */
-ve.ce.MWHieroNode.prototype.onParseSuccess = function ( deferred, response ) {
-	var data = response.visualeditor, contentNodes = $( data.content ).get();
-	deferred.resolve( contentNodes );
-	// Rerender after image load
-	this.$.find( 'img' ).on( 'load', ve.bind( function () {
-		this.emit( 'rerender' );
-	}, this ) );
-};
-
 /* Registration */
 
 ve.ce.nodeFactory.register( ve.ce.MWHieroNode );
diff --git a/modules/ve/ce/ve.ce.FocusableNode.js b/modules/ve/ce/ve.ce.FocusableNode.js
index 6647d3e813..1afc40d982 100644
--- a/modules/ve/ce/ve.ce.FocusableNode.js
+++ b/modules/ve/ce/ve.ce.FocusableNode.js
@@ -106,6 +106,8 @@ ve.ce.FocusableNode.prototype.onFocusableResize = function () {
 ve.ce.FocusableNode.prototype.onFocusableRerender = function () {
 	if ( this.focused ) {
 		this.redrawHighlight();
+		// reposition menu
+		this.surface.getSurface().getContext().show( true );
 	}
 };