diff --git a/settings-dialogs/tweaks-settings.c b/settings-dialogs/tweaks-settings.c
index 1e36c581708fb2c9e9ae56e338daa1a9257aff75..f60b606698596ba3b5dd607ef19cbafae90edd06 100644
--- a/settings-dialogs/tweaks-settings.c
+++ b/settings-dialogs/tweaks-settings.c
@@ -142,6 +142,12 @@ cb_urgent_blink_button_toggled (GtkToggleButton *toggle, GtkWidget *repeat_urgen
     gtk_widget_set_sensitive (repeat_urgent_blink, gtk_toggle_button_get_active (toggle));
 }
 
+static void
+cb_restore_on_move_check_button_toggled (GtkToggleButton *toggle, GtkWidget *button)
+{
+    gtk_widget_set_sensitive (button, gtk_toggle_button_get_active (toggle));
+}
+
 static void
 wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
 {
@@ -175,6 +181,7 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
     GtkWidget *raise_with_any_button_check = GTK_WIDGET (gtk_builder_get_object (builder, "raise_with_any_button_check"));
     GtkWidget *borderless_maximize_check = GTK_WIDGET (gtk_builder_get_object (builder, "borderless_maximize_check"));
     GtkWidget *restore_on_move_check = GTK_WIDGET (gtk_builder_get_object (builder, "restore_on_move_check"));
+    GtkWidget *tile_on_move_check = GTK_WIDGET (gtk_builder_get_object (builder, "tile_on_move_check"));
     GtkWidget *snap_resist_check = GTK_WIDGET (gtk_builder_get_object (builder, "snap_resist_check"));
     GtkWidget *urgent_blink = GTK_WIDGET (gtk_builder_get_object (builder, "urgent_blink"));
     GtkWidget *repeat_urgent_blink = GTK_WIDGET (gtk_builder_get_object (builder, "repeat_urgent_blink"));
@@ -285,6 +292,10 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
                       "toggled",
                       G_CALLBACK (cb_urgent_blink_button_toggled),
                       repeat_urgent_blink);
+    g_signal_connect (G_OBJECT (restore_on_move_check),
+                      "toggled",
+                      G_CALLBACK (cb_restore_on_move_check_button_toggled),
+                      tile_on_move_check);
 
     /* Bind easy properties */
     /* Cycling tab */
@@ -328,6 +339,10 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
                             "/general/restore_on_move",
                             G_TYPE_BOOLEAN,
                             (GObject *)restore_on_move_check, "active");
+    xfconf_g_property_bind (xfwm4_channel,
+                            "/general/tile_on_move",
+                            G_TYPE_BOOLEAN,
+                            (GObject *)tile_on_move_check, "active");
     xfconf_g_property_bind (xfwm4_channel,
                             "/general/snap_resist",
                             G_TYPE_BOOLEAN,
@@ -342,6 +357,8 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
                             (GObject *)repeat_urgent_blink, "active");
     gtk_widget_set_sensitive (repeat_urgent_blink,
                               gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (urgent_blink)));
+    gtk_widget_set_sensitive (tile_on_move_check,
+                              gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (restore_on_move_check)));
 
     /* Workspaces tab */
     xfconf_g_property_bind (xfwm4_channel,
diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade
index 7406ec0b0a575251ded9808490f7d8ca91848614..bb857408c68f46a27080570bedb770be7f005fde 100644
--- a/settings-dialogs/xfwm4-tweaks-dialog.glade
+++ b/settings-dialogs/xfwm4-tweaks-dialog.glade
@@ -357,6 +357,21 @@ or "skip taskbar" properties set</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkCheckButton" id="tile_on_move_check">
+                    <property name="label" translatable="yes">Automaticaly _tile windows when moving toward the screen edge</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkCheckButton" id="snap_resist_check">
                     <property name="label" translatable="yes">Use _edge resistance instead of window snapping</property>
@@ -369,7 +384,7 @@ or "skip taskbar" properties set</property>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">4</property>
+                    <property name="position">5</property>
                   </packing>
                 </child>
                 <child>