Index: src/wp-includes/js/tinymce/plugins/wplink/plugin.js
===================================================================
--- src/wp-includes/js/tinymce/plugins/wplink/plugin.js	(revision 31691)
+++ src/wp-includes/js/tinymce/plugins/wplink/plugin.js	(working copy)
@@ -1,12 +1,7 @@
 /* global tinymce */
 tinymce.PluginManager.add( 'wplink', function( editor ) {
-	var linkButton;
-
-	// Register a command so that it can be invoked by using tinyMCE.activeEditor.execCommand( 'WP_Link' );
 	editor.addCommand( 'WP_Link', function() {
-		if ( ( ! linkButton || ! linkButton.disabled() ) && typeof window.wpLink !== 'undefined' ) {
-			window.wpLink.open( editor.id );
-		}
+		window.wpLink && window.wpLink.open( editor.id );
 	});
 
 	// WP default shortcut
@@ -14,41 +9,18 @@
 	// The "de-facto standard" shortcut, see #27305
 	editor.addShortcut( 'ctrl+k', '', 'WP_Link' );
 
-	function setState( button, node ) {
-		var parent = editor.dom.getParent( node, 'a' ),
-			getView = editor.plugins.wpview ? editor.plugins.wpview.getView : function() { return false; };
-
-		button.disabled( ( editor.selection.isCollapsed() && ! parent ) || ( parent && ! parent.href ) || getView( node ) );
-		button.active( parent && parent.href );
-	}
-
 	editor.addButton( 'link', {
 		icon: 'link',
 		tooltip: 'Insert/edit link',
 		shortcut: 'Alt+Shift+A',
 		cmd: 'WP_Link',
-
-		onPostRender: function() {
-			linkButton = this;
-
-			editor.on( 'nodechange', function( event ) {
-				setState( linkButton, event.element );
-			});
-		}
+		stateSelector: 'a[href]'
 	});
 
 	editor.addButton( 'unlink', {
 		icon: 'unlink',
 		tooltip: 'Remove link',
-		cmd: 'unlink',
-
-		onPostRender: function() {
-			var unlinkButton = this;
-
-			editor.on( 'nodechange', function( event ) {
-				setState( unlinkButton, event.element );
-			});
-		}
+		cmd: 'unlink'
 	});
 
 	editor.addMenuItem( 'link', {