diff --git a/defaults/defaults b/defaults/defaults
index 2b1ba5b..2930a0a 100644
--- a/defaults/defaults
+++ b/defaults/defaults
@@ -6,6 +6,7 @@ button_layout=O|SHMC
 button_offset=0
 button_spacing=0
 click_to_focus=true
+clientfill_on_border_doubleclick=true
 cycle_apps_only=false
 cycle_draw_frame=true
 cycle_hidden=true
diff --git a/src/events.c b/src/events.c
index e8b6b34..3372aa1 100644
--- a/src/events.c
+++ b/src/events.c
@@ -624,7 +624,7 @@ edgeButton (Client * c, int part, XButtonEvent * ev)
             clientRaise (c, None);
         }
         tclick = typeOfClick (screen_info, c->window, (XEvent *) ev, TRUE);
-        if (tclick == XFWM_BUTTON_DOUBLE_CLICK)
+        if (tclick == XFWM_BUTTON_DOUBLE_CLICK && screen_info->params->clientfill_on_border_doubleclick)
         {
             switch (part)
             {
diff --git a/src/settings.c b/src/settings.c
index ce2f8c0..d1a2f48 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -717,6 +717,7 @@ loadSettings (ScreenInfo *screen_info)
         {"button_offset", NULL, G_TYPE_INT, TRUE},
         {"button_spacing", NULL, G_TYPE_INT, TRUE},
         {"click_to_focus", NULL, G_TYPE_BOOLEAN, TRUE},
+        {"clientfill_on_border_doubleclick", NULL, G_TYPE_BOOLEAN, TRUE},
         {"cycle_apps_only", NULL, G_TYPE_BOOLEAN, TRUE},
         {"cycle_draw_frame", NULL, G_TYPE_BOOLEAN, TRUE},
         {"cycle_hidden", NULL, G_TYPE_BOOLEAN, TRUE},
@@ -810,6 +811,8 @@ loadSettings (ScreenInfo *screen_info)
         getBoolValue ("box_move", rc);
     screen_info->params->click_to_focus =
         getBoolValue ("click_to_focus", rc);
+    screen_info->params->clientfill_on_border_doubleclick =
+        getBoolValue ("clientfill_on_border_doubleclick", rc);
     screen_info->params->cycle_apps_only =
         getBoolValue ("cycle_apps_only", rc);
     screen_info->params->cycle_minimum =
@@ -1281,6 +1284,10 @@ cb_xfwm4_channel_property_changed(XfconfChannel *channel, const gchar *property_
                     screen_info->params->click_to_focus = g_value_get_boolean (value);
                     update_grabs (screen_info);
                 }
+                else if (!strcmp (name, "clientfill_on_border_doubleclick"))
+                {
+                    screen_info->params->clientfill_on_border_doubleclick = g_value_get_boolean (value);
+                }
                 else if (!strcmp (name, "focus_new"))
                 {
                     screen_info->params->focus_new = g_value_get_boolean (value);
diff --git a/src/settings.h b/src/settings.h
index b1467b9..a346a73 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -206,6 +206,7 @@ struct _XfwmParams
     gboolean box_move;
     gboolean box_resize;
     gboolean click_to_focus;
+    gboolean clientfill_on_border_doubleclick;
     gboolean cycle_apps_only;
     gboolean cycle_draw_frame;
     gboolean cycle_hidden;