Index: wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js
===================================================================
--- wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js	(revision 4704)
+++ wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js	(working copy)
@@ -558,6 +558,8 @@
 	e.parentNode.removeChild(e);
 
 	mcWindows.setDocumentLock(false);
+
+	tinyMCE.selectedInstance.getWin().focus();
 };
 
 TinyMCE_Window.prototype.onMouseMove = function(e) {
Index: wp-includes/js/tinymce/tiny_mce.js
===================================================================
--- wp-includes/js/tinymce/tiny_mce.js	(revision 4704)
+++ wp-includes/js/tinymce/tiny_mce.js	(working copy)
@@ -2813,7 +2813,7 @@
 				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);
 				}