diff --git a/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js b/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js
index c005a9e7be..304e478689 100644
--- a/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js
+++ b/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js
@@ -558,6 +558,8 @@ TinyMCE_Window.prototype.close = function() {
 	e.parentNode.removeChild(e);
 
 	mcWindows.setDocumentLock(false);
+
+	tinyMCE.selectedInstance.getWin().focus();
 };
 
 TinyMCE_Window.prototype.onMouseMove = function(e) {
diff --git a/wp-includes/js/tinymce/tiny_mce.js b/wp-includes/js/tinymce/tiny_mce.js
index ecd78a231e..aece8d1475 100644
--- a/wp-includes/js/tinymce/tiny_mce.js
+++ b/wp-includes/js/tinymce/tiny_mce.js
@@ -2813,7 +2813,7 @@ TinyMCE_Control.prototype = {
 				if (tinyMCE.isGecko && this.getSel().isCollapsed) {
 					focusElm = tinyMCE.getParentElement(focusElm, 'A');
 
-					if (focusElm)
+					if (focusElm && this.getRng(0).endOffset > 0 && this.getRng(0).endOffset != focusElm.innerHTML.length)
 						this.selection.selectNode(focusElm, false);
 				}