diff --git a/src/main/java/com/redhat/devtools/lsp4ij/settings/ui/LanguageServerPanel.java b/src/main/java/com/redhat/devtools/lsp4ij/settings/ui/LanguageServerPanel.java
index f09b3f931..eae9b8bd3 100644
--- a/src/main/java/com/redhat/devtools/lsp4ij/settings/ui/LanguageServerPanel.java
+++ b/src/main/java/com/redhat/devtools/lsp4ij/settings/ui/LanguageServerPanel.java
@@ -251,14 +251,12 @@ private static JLabel createLabelForComponent(@NotNull @NlsContexts.Label String
 
     private void createConfigurationField(FormBuilder builder) {
         configurationWidget = new LanguageServerConfigurationWidget(project);
-        JBScrollPane scrollPane = new JBScrollPane(configurationWidget);
-        builder.addLabeledComponent(LanguageServerBundle.message("language.server.configuration"), scrollPane, true);
+        builder.addLabeledComponentFillVertically(LanguageServerBundle.message("language.server.configuration"), configurationWidget);
     }
 
     private void createInitializationOptionsTabField(FormBuilder builder) {
         initializationOptionsWidget = new LanguageServerInitializationOptionsWidget(project);
-        JBScrollPane scrollPane = new JBScrollPane(initializationOptionsWidget);
-        builder.addLabeledComponent(LanguageServerBundle.message("language.server.initializationOptions"), scrollPane, true);
+        builder.addLabeledComponentFillVertically(LanguageServerBundle.message("language.server.initializationOptions"), initializationOptionsWidget);
     }
 
     public JBTextField getServerName() {