diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php
index f5ffaf84d3..bda3664764 100644
--- a/src/wp-includes/class-wp-editor.php
+++ b/src/wp-includes/class-wp-editor.php
@@ -1091,6 +1091,9 @@ final class _WP_Editors {
 			<div id="wp-link-update">
 				<input type="submit" value="<?php esc_attr_e( 'Add Link' ); ?>" class="button-primary" id="wp-link-submit" name="wp-link-submit">
 			</div>
+			<div id="wp-link-cancel">
+				<a class="submitdelete deletion" href="#"><?php _e( 'Cancel' ); ?></a>
+			</div>
 		</div>
 		</form>
 		</div>
diff --git a/src/wp-includes/css/editor.css b/src/wp-includes/css/editor.css
index d8a280d317..1cf0ee6da8 100644
--- a/src/wp-includes/css/editor.css
+++ b/src/wp-includes/css/editor.css
@@ -1153,8 +1153,8 @@ i.mce-caret:before {
 	right: 0;
 }
 
-#wp-link-cancel { 
-	line-height: 25px; 
+#wp-link-cancel {
+	line-height: 25px;
 }
 
 #wp-link-update {
@@ -1167,39 +1167,61 @@ i.mce-caret:before {
 	margin-bottom: 0;
 }
 
-@media screen and ( max-width: 782px ), ( max-height: 520px ) {
+@media screen and ( max-width: 782px ) {
+	#wp-link-wrap {
+		height: 270px;
+		margin-top: -135px;
+	}
 
-	#wp-link-wrap,
-	#wp-link-wrap.search-panel-visible {
+	#wp-link-wrap.search-panel-visible .query-results {
+		top: 235px;
+	}
+}
+
+@media screen and ( max-width: 620px ) {
+	#wp-link-wrap {
 		width: auto;
-		height: auto;
-		margin: 0;
-		top: 10px;
+		margin-left: 0;
 		left: 10px;
 		right: 10px;
-		bottom: 10px;
 		max-width: 600px;
-		margin: auto;
+	}
+}
+
+@media screen and ( max-height: 520px ) {
+	#wp-link-wrap.search-panel-visible {
+		height: auto;
+		margin-top: 0;
+		top: 10px;
+		bottom: 10px;
+	}
+
+	.search-panel-visible #link-selector {
+		overflow: auto;
+	}
+
+	.search-panel-visible #search-panel .query-results {
+		position: static;
+	}
+}
+
+@media screen and ( max-height: 290px ) {
+	#wp-link-wrap {
+		height: auto;
+		margin-top: 0;
+		top: 10px;
+		bottom: 10px;
 	}
 
 	#link-selector {
 		overflow: auto;
-		height: calc(100% - 88px);
-		padding-bottom: 0;
-	}
-
-	#wp-link #search-panel {
-		display: block;
-	}
-
-	#wp-link-search-toggle {
-		display: none;
+		height: calc(100% - 92px);
+		padding-bottom: 10px;
 	}
 
 	#search-panel .query-results {
 		position: static;
 	}
-
 }
 
 /* Old TinyMCE 3.x modal */
diff --git a/src/wp-includes/js/wplink.js b/src/wp-includes/js/wplink.js
index f8fd92e0a7..5de8f3b01f 100644
--- a/src/wp-includes/js/wplink.js
+++ b/src/wp-includes/js/wplink.js
@@ -38,7 +38,7 @@ var wpLink;
 				event.preventDefault();
 				wpLink.update();
 			});
-			inputs.close.add( inputs.backdrop ).click( function( event ) {
+			inputs.close.add( inputs.backdrop ).add( '#wp-link-cancel a' ).click( function( event ) {
 				event.preventDefault();
 				wpLink.close();
 			});