diff --git a/plugins/pastebin/pastebin_dialog.vala b/plugins/pastebin/pastebin_dialog.vala
index db4ad5d5be..25f3711c80 100644
--- a/plugins/pastebin/pastebin_dialog.vala
+++ b/plugins/pastebin/pastebin_dialog.vala
@@ -316,8 +316,10 @@ namespace Scratch.Dialogs {
             };
 
             stack = new Gtk.Stack () {
-                margin = 12,
-                margin_top = 0
+                margin_top = 0,
+                margin_bottom = 12,
+                margin_start = 12,
+                margin_end = 12
             };
             stack.add (grid);
             stack.add (spinner);
@@ -362,7 +364,10 @@ namespace Scratch.Dialogs {
             for (var i=0; i < languages.length[0]; i++) {
                 var label = new Gtk.Label (languages[i, 2]) {
                     halign = Gtk.Align.START,
-                    margin = 6
+                    margin_top = 6,
+                    margin_bottom = 6,
+                    margin_start = 6,
+                    margin_end = 6
                 };
 
                 languages_listbox.add (label);
@@ -382,8 +387,10 @@ namespace Scratch.Dialogs {
             select_button.clicked.connect (select_button_clicked);
 
             var frame = new Gtk.Frame (null) {
-                margin = 12,
-                margin_top = 0
+                margin_top = 0,
+                margin_bottom = 12,
+                margin_start = 12,
+                margin_end = 12
             };
             frame.add (languages_scrolled);
 
diff --git a/src/Dialogs/PreferencesDialog.vala b/src/Dialogs/PreferencesDialog.vala
index 96bc5def6d..70af5aac18 100644
--- a/src/Dialogs/PreferencesDialog.vala
+++ b/src/Dialogs/PreferencesDialog.vala
@@ -143,7 +143,10 @@ public class Scratch.Dialogs.Preferences : Granite.Dialog {
         interface_box.add (font_box);
 
         var stack = new Gtk.Stack () {
-            margin = 12,
+            margin_top = 12,
+            margin_bottom = 12,
+            margin_start = 12,
+            margin_end = 12,
             vhomogeneous = true
         };
         stack.add_titled (behavior_box, "behavior", _("Behavior"));
diff --git a/src/Widgets/ChooseProjectButton.vala b/src/Widgets/ChooseProjectButton.vala
index 2cb03a96af..645de64f51 100644
--- a/src/Widgets/ChooseProjectButton.vala
+++ b/src/Widgets/ChooseProjectButton.vala
@@ -62,8 +62,10 @@ public class Code.ChooseProjectButton : Gtk.MenuButton {
             selection_mode = Gtk.SelectionMode.SINGLE
         };
         var project_filter = new Gtk.SearchEntry () {
-            margin = 12,
+            margin_top = 12,
             margin_bottom = 6,
+            margin_start = 12,
+            margin_end = 12,
             placeholder_text = _("Filter projects")
         };
 
diff --git a/src/Widgets/FormatBar.vala b/src/Widgets/FormatBar.vala
index f7547fbd73..810cf92a71 100644
--- a/src/Widgets/FormatBar.vala
+++ b/src/Widgets/FormatBar.vala
@@ -82,8 +82,10 @@ public class Code.FormatBar : Gtk.Box {
         });
 
         lang_selection_filter = new Gtk.SearchEntry () {
-            margin = 12,
+            margin_top = 12,
             margin_bottom = 6,
+            margin_start = 12,
+            margin_end = 12,
             placeholder_text = _("Filter languages")
         };
 
@@ -238,8 +240,12 @@ public class Code.FormatBar : Gtk.Box {
 
         goto_entry = new Gtk.Entry ();
 
-        var line_grid = new Gtk.Grid ();
-        line_grid.margin = 12;
+        var line_grid = new Gtk.Grid () {
+            margin_top = 12,
+            margin_bottom = 12,
+            margin_start = 12,
+            margin_end = 12
+        };
         line_grid.column_spacing = 12;
         line_grid.attach (goto_label, 0, 0, 1, 1);
         line_grid.attach (goto_entry, 1, 0, 1, 1);