diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java
index e29db503f32fbff22d8f33dcf471b8423c9238af..7650a10e8921d9d20ee384618f777ed98ecde139 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java
@@ -73,7 +73,7 @@ public class GlobalSettingsViewController extends NVC implements IGlobalSettings
 		stage.getIcons().add(PlayPadPlugin.getInstance().getIcon());
 
 		stage.setMinWidth(715);
-		stage.setMinHeight(700);
+		stage.setMinHeight(800);
 		stage.setTitle(Localization.getString(Strings.UI_WINDOW_GLOBAL_SETTINGS_TITLE));
 
 		PlayPadPlugin.styleable().applyStyle(stage);
diff --git a/PlayWallPlugins/PlayWallPluginWebAPI/src/main/scala/de/tobias/playpad/plugin/api/settings/WebApiSettingsViewController.scala b/PlayWallPlugins/PlayWallPluginWebAPI/src/main/scala/de/tobias/playpad/plugin/api/settings/WebApiSettingsViewController.scala
index 30de1703f50ec74c32dc58e88ee50eb75e65af9a..b8cfa5a1d26c4e9163bda871576fb5577f882a68 100644
--- a/PlayWallPlugins/PlayWallPluginWebAPI/src/main/scala/de/tobias/playpad/plugin/api/settings/WebApiSettingsViewController.scala
+++ b/PlayWallPlugins/PlayWallPluginWebAPI/src/main/scala/de/tobias/playpad/plugin/api/settings/WebApiSettingsViewController.scala
@@ -52,6 +52,10 @@ class WebApiSettingsViewController(val webApiSettings: WebApiSettings) extends G
 				clearTextFields()
 			}
 		})
+
+		remoteNameTextField.disableProperty().bind(remoteListView.getSelectionModel.selectedItemProperty().isNull)
+		remoteAddressTextField.disableProperty().bind(remoteListView.getSelectionModel.selectedItemProperty().isNull)
+		remotePortTextField.disableProperty().bind(remoteListView.getSelectionModel.selectedItemProperty().isNull)
 	}
 
 	private def saveSettingsToRemoteList(remote: WebApiRemoteSettings): Unit = {