diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js
index c5de8f2c45..39d46bd258 100644
--- a/src/wp-includes/js/media-views.js
+++ b/src/wp-includes/js/media-views.js
@@ -2395,6 +2395,7 @@
 			}, this );
 
 			this.on( 'content:create:iframe', this.iframeContent, this );
+			this.on( 'content:deactivate:iframe', this.iframeContentCleanup, this );
 			this.on( 'menu:render:default', this.iframeMenu, this );
 			this.on( 'open', this.hijackThickbox, this );
 			this.on( 'close', this.restoreThickbox, this );
@@ -2411,6 +2412,10 @@
 			});
 		},
 
+		iframeContentCleanup: function( content ) {
+			this.$el.removeClass('hide-toolbar');
+		},
+
 		iframeMenu: function( view ) {
 			var views = {};