diff --git a/src/main/java/eva2/gui/OptimizationEditorPanel.java b/src/main/java/eva2/gui/OptimizationEditorPanel.java
index e8592c16..d90ef34c 100644
--- a/src/main/java/eva2/gui/OptimizationEditorPanel.java
+++ b/src/main/java/eva2/gui/OptimizationEditorPanel.java
@@ -170,9 +170,6 @@ public class OptimizationEditorPanel extends JPanel implements ItemListener {
             ((JDialog) container).dispose();
         });
 
-        // 10px padding
-        setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-
         setLayout(new GridBagLayout());
         GridBagConstraints gbConstraints = new GridBagConstraints();
 
diff --git a/src/main/java/eva2/gui/PropertyDialog.java b/src/main/java/eva2/gui/PropertyDialog.java
index 773e9d00..e9bf7fef 100644
--- a/src/main/java/eva2/gui/PropertyDialog.java
+++ b/src/main/java/eva2/gui/PropertyDialog.java
@@ -26,6 +26,8 @@ public class PropertyDialog extends JDialog {
         setLayout(new BorderLayout());
         propertyEditor = editor;
         editorComponent = editor.getCustomEditor();
+
+        ((JPanel)getContentPane()).setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
         add(editorComponent, BorderLayout.CENTER);
 
         pack();
diff --git a/src/main/java/eva2/gui/TabbedFrameMaker.java b/src/main/java/eva2/gui/TabbedFrameMaker.java
index 868e2ac3..17125f96 100644
--- a/src/main/java/eva2/gui/TabbedFrameMaker.java
+++ b/src/main/java/eva2/gui/TabbedFrameMaker.java
@@ -59,6 +59,8 @@ public class TabbedFrameMaker implements Serializable, PanelMaker, InterfaceNoti
 
         for (PanelMaker element : pmContainer) {
             JComponent panel = element.makePanel();
+
+            panel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
             if (element instanceof ModuleButtonPanelMaker) {
                 extToolBar.add(panel);
                 butPanelMkr = (ModuleButtonPanelMaker) element;