diff -Nru gnome-applets-3.18.1.orig/windowpicker/src/wp-preferences-dialog.c gnome-applets-3.18.1/windowpicker/src/wp-preferences-dialog.c
--- gnome-applets-3.18.1.orig/windowpicker/src/wp-preferences-dialog.c	2015-09-09 13:33:16.000000000 -0400
+++ gnome-applets-3.18.1/windowpicker/src/wp-preferences-dialog.c	2015-12-13 22:52:08.000000000 -0500
@@ -25,6 +25,7 @@
 
 #include "wp-preferences-dialog.h"
 
+#define METACITY_SCHEMA "org.gnome.metacity"
 #define GRESOURCE "/org/gnome/gnome-applets/window-picker/"
 
 struct _WpPreferencesDialog
@@ -38,6 +39,7 @@
   GtkWidget *check_show_home_title;
   GtkWidget *check_icons_greyscale;
   GtkWidget *check_expand_task_list;
+  GtkWidget *check_show_maximized_titlebars;
 };
 
 enum
@@ -55,8 +57,10 @@
 wp_preferences_dialog_constructed (GObject *object)
 {
   WpPreferencesDialog *dialog;
+  GSettings *metacity_settings;
 
   dialog = WP_PREFERENCES_DIALOG (object);
+  metacity_settings = g_settings_new (METACITY_SCHEMA);
 
   G_OBJECT_CLASS (wp_preferences_dialog_parent_class)->constructed (object);
 
@@ -79,6 +83,10 @@
   g_settings_bind (dialog->settings, KEY_EXPAND_TASK_LIST,
                    dialog->check_expand_task_list, "active",
                    G_SETTINGS_BIND_DEFAULT);
+
+  g_settings_bind (metacity_settings, KEY_SHOW_MAXIMIZED_TITLEBARS,
+                   dialog->check_show_maximized_titlebars, "active",
+                   G_SETTINGS_BIND_DEFAULT);
 }
 
 static void
@@ -151,6 +159,8 @@
                                         check_icons_greyscale);
   gtk_widget_class_bind_template_child (widget_class, WpPreferencesDialog,
                                         check_expand_task_list);
+  gtk_widget_class_bind_template_child (widget_class, WpPreferencesDialog,
+                                        check_show_maximized_titlebars);
 }
 
 static void
diff -Nru gnome-applets-3.18.1.orig/windowpicker/src/wp-preferences-dialog.h gnome-applets-3.18.1/windowpicker/src/wp-preferences-dialog.h
--- gnome-applets-3.18.1.orig/windowpicker/src/wp-preferences-dialog.h	2015-09-09 13:33:16.000000000 -0400
+++ gnome-applets-3.18.1/windowpicker/src/wp-preferences-dialog.h	2015-12-13 22:52:54.000000000 -0500
@@ -25,6 +25,7 @@
 #define KEY_SHOW_HOME_TITLE        "show-home-title"
 #define KEY_ICONS_GREYSCALE        "icons-greyscale"
 #define KEY_EXPAND_TASK_LIST       "expand-task-list"
+#define KEY_SHOW_MAXIMIZED_TITLEBARS "show-maximized-titlebars"
 
 G_BEGIN_DECLS
 
diff -Nru gnome-applets-3.18.1.orig/windowpicker/src/wp-preferences-dialog.ui gnome-applets-3.18.1/windowpicker/src/wp-preferences-dialog.ui
--- gnome-applets-3.18.1.orig/windowpicker/src/wp-preferences-dialog.ui	2015-09-09 13:33:16.000000000 -0400
+++ gnome-applets-3.18.1/windowpicker/src/wp-preferences-dialog.ui	2015-12-13 22:51:08.000000000 -0500
@@ -129,6 +129,21 @@
                 <property name="position">4</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkCheckButton" id="check_show_maximized_titlebars">
+                <property name="label" translatable="yes">Show titlebars of maximized windows</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>