diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index 054c5f2e62..9dab941f42 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -521,6 +521,7 @@ span.wp-media-buttons-icon:before {
 .notification-dialog {
 	position: fixed;
 	top: 30%;
+	max-height: 70%;
 	left: 50%;
 	width: 450px;
 	margin-left: -225px;
@@ -529,6 +530,7 @@ span.wp-media-buttons-icon:before {
 	box-shadow: 0 3px 6px rgba( 0, 0, 0, 0.3 );
 	line-height: 1.5;
 	z-index: 1000005;
+	overflow-y: auto;
 }
 
 .notification-dialog-background {
diff --git a/src/wp-admin/css/forms.css b/src/wp-admin/css/forms.css
index 3c45f2b935..e35be909d6 100644
--- a/src/wp-admin/css/forms.css
+++ b/src/wp-admin/css/forms.css
@@ -862,6 +862,7 @@ table.form-table td .updated p {
 
 .request-filesystem-credentials-dialog .notification-dialog {
 	top: 15%;
+	max-height: 85%;
 }
 
 .request-filesystem-credentials-dialog-content {
@@ -1171,11 +1172,11 @@ table.form-table td .updated p {
 	.request-filesystem-credentials-dialog	.notification-dialog{
 		width: 100%;
 		height: 100%;
+		max-height: 100%;
 		position: fixed;
 		top: 0;
 		margin: 0;
 		left: 0;
-		overflow-y: auto;
 	}
 }
 
diff --git a/src/wp-admin/js/updates.js b/src/wp-admin/js/updates.js
index ddbfc097d7..afd667862b 100644
--- a/src/wp-admin/js/updates.js
+++ b/src/wp-admin/js/updates.js
@@ -467,6 +467,11 @@ window.wp = window.wp || {};
 			wp.updates.requestForCredentialsModalCancel();
 		});
 
+		// Hide SSH fields when not selected
+		$( '#request-filesystem-credentials-dialog input[name="connection_type"]' ).on( 'change', function() {
+			$( this ).parents( 'form' ).find( '#private_key, #public_key' ).parents( 'label' ).toggle( ( 'ssh' == $( this ).val() ) );
+		}).change();
+
 		// Click handler for plugin updates in List Table view.
 		$( '.plugin-update-tr' ).on( 'click', '.update-link', function( e ) {
 			e.preventDefault();
@@ -490,7 +495,6 @@ window.wp = window.wp || {};
 			wp.updates.updatePlugin( $button.data( 'plugin' ), $button.data( 'slug' ) );
 		} );
 
-		//
 		$( '#plugin_update_from_iframe' ).on( 'click' , function( e ) {
 			var target,	data;