diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java
index 79a97e74367fd36aaef2894984b511e4d36d89dd..ecb4a9a2e7939fc82b70cb8169f4347a3f984c79 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java
@@ -147,7 +147,7 @@ public class Controller extends BaseController
 				Logger.error(e);
 			}
 		}
-		Worker.shutdown();		
+		Worker.shutdown();
 		System.exit(0);
 	}
 	
@@ -792,7 +792,9 @@ public class Controller extends BaseController
 	
 	public void refresh(FilterSettings newFilterSettings)
 	{
-		LoadingModal.showModal(Localization.getString(Strings.TITLE_MODAL), Localization.getString(Strings.LOAD_DATA), getStage(), icon);
+		Platform.runLater(()->{
+			LoadingModal.showModal(Localization.getString(Strings.TITLE_MODAL), Localization.getString(Strings.LOAD_DATA), getStage(), icon);
+		});
 
 		Worker.runLater(() -> {
 			try
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/LocalServerSettingsController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/LocalServerSettingsController.java
index 9a4e7bdc7bfc3cc1733ae8e32c7e4401deaa7364..4be588d8c550726501e4a7d5789643e0af50d3db 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/LocalServerSettingsController.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/LocalServerSettingsController.java
@@ -107,6 +107,7 @@ public class LocalServerSettingsController extends SettingsController
 		refreshLabelsUpdate();
 		
 		prefill();
+		checkServerStatus();
 	}
 
 	@Override
@@ -131,8 +132,6 @@ public class LocalServerSettingsController extends SettingsController
 		}
 
 		checkboxEnableAutoUpdate.setSelected(controller.getSettings().isAutoUpdateCheckEnabled());
-		
-		checkServerStatus();
 	}
 
 	private void checkServerStatus()
@@ -147,7 +146,9 @@ public class LocalServerSettingsController extends SettingsController
 				save();
 				break;
 			case INACTIVE:
-				LoadingModal.showModal(Localization.getString(Strings.TITLE_MODAL), Localization.getString(Strings.LOAD_LOCAL_SERVER), controller.getStage(), controller.getIcon());
+				Platform.runLater(()->{
+					LoadingModal.showModal(Localization.getString(Strings.TITLE_MODAL), Localization.getString(Strings.LOAD_LOCAL_SERVER), controller.getStage(), controller.getIcon());
+				});
 				labelLocalServerStatus.setText(Localization.getString(Strings.LOCAL_SERVER_STATUS_NOT_STARTED));
 				buttonLocalServerAction.setVisible(false);
 				Worker.runLater(() -> {