diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/options/CodeCompletionPanel.form b/php/php.editor/src/org/netbeans/modules/php/editor/options/CodeCompletionPanel.form
index 73450cbf7c67..71d38a15db54 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/options/CodeCompletionPanel.form
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/options/CodeCompletionPanel.form
@@ -83,7 +83,7 @@
                       </Group>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace max="-2" attributes="0"/>
+                      <EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Component id="codeCompletionTypeLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                           <Component id="smartRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
@@ -100,19 +100,19 @@
                       </Group>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace max="-2" attributes="0"/>
+                      <EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
                       <Component id="useLowercaseLabel" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace max="-2" attributes="0"/>
+                      <EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
                       <Component id="trueFalseNullCheckBox" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace max="-2" attributes="0"/>
+                      <EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
                       <Component id="autoCompletionCommentAsteriskLabel" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace max="-2" attributes="0"/>
+                      <EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
                       <Component id="autoCompletionCommentAsteriskCheckBox" min="-2" max="-2" attributes="0"/>
                   </Group>
               </Group>
@@ -153,9 +153,9 @@
               <Component id="currentFileVariablesRadioButton" min="-2" max="-2" attributes="0"/>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Component id="codeCompletionTypeLabel" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Component id="smartRadioButton" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Component id="smartInfoLabel" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="fullyQualifiedRadioButton" min="-2" max="-2" attributes="0"/>
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/options/CodeCompletionPanel.java b/php/php.editor/src/org/netbeans/modules/php/editor/options/CodeCompletionPanel.java
index 2c37ebf34f5e..f52dd8ea21be 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/options/CodeCompletionPanel.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/options/CodeCompletionPanel.java
@@ -473,7 +473,7 @@ private void initComponents() {
                             .addComponent(autoStringConcatenationCheckBox)
                             .addComponent(codeCompletionFirstClassCallableCheckBox)))
                     .addGroup(layout.createSequentialGroup()
-                        .addContainerGap()
+                        .addGap(12, 12, 12)
                         .addGroup(layout.createParallelGroup(Alignment.LEADING)
                             .addComponent(codeCompletionTypeLabel)
                             .addComponent(smartRadioButton)
@@ -486,16 +486,16 @@ private void initComponents() {
                                     .addComponent(fullyQualifiedInfoLabel)
                                     .addComponent(unqualifiedInfoLabel)))))
                     .addGroup(layout.createSequentialGroup()
-                        .addContainerGap()
+                        .addGap(12, 12, 12)
                         .addComponent(useLowercaseLabel))
                     .addGroup(layout.createSequentialGroup()
-                        .addContainerGap()
+                        .addGap(12, 12, 12)
                         .addComponent(trueFalseNullCheckBox))
                     .addGroup(layout.createSequentialGroup()
-                        .addContainerGap()
+                        .addGap(12, 12, 12)
                         .addComponent(autoCompletionCommentAsteriskLabel))
                     .addGroup(layout.createSequentialGroup()
-                        .addContainerGap()
+                        .addGap(12, 12, 12)
                         .addComponent(autoCompletionCommentAsteriskCheckBox)))
                 .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );