diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index de9f9ae91..904a2f6fc 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -2531,28 +2531,30 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y)
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, "Close");
    e_menu_item_callback_set(mi, _e_border_menu_cb_close, bd);
-   mi = e_menu_item_new(m);
-   if (bd->shaded)
-     e_menu_item_label_set(mi, "Un-Shade");
-   else 
-     e_menu_item_label_set(mi, "Shade");
-   e_menu_item_callback_set(mi, _e_border_menu_cb_shade, bd);
 
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, "Iconify");
    e_menu_item_callback_set(mi, _e_border_menu_cb_iconify, bd);
+
    mi = e_menu_item_new(m);
-   if (bd->maximized)
-     e_menu_item_label_set(mi, "Restore");
-   else
-     e_menu_item_label_set(mi, "Maximize");
+   e_menu_item_separator_set(mi, 1);
+
+   mi = e_menu_item_new(m);
+   e_menu_item_label_set(mi, "Shade");
+   e_menu_item_check_set(mi, 1);
+   e_menu_item_toggle_set(mi, (bd->shaded ? 1 : 0));
+   e_menu_item_callback_set(mi, _e_border_menu_cb_shade, bd);
+
+   mi = e_menu_item_new(m);
+   e_menu_item_label_set(mi, "Maximize");
+   e_menu_item_check_set(mi, 1);
+   e_menu_item_toggle_set(mi, (bd->maximized ? 1 : 0));
    e_menu_item_callback_set(mi, _e_border_menu_cb_maximize, bd);
 
    mi = e_menu_item_new(m);
-   if (bd->sticky)
-     e_menu_item_label_set(mi, "Un-Stick");
-   else
-     e_menu_item_label_set(mi, "Stick");
+   e_menu_item_label_set(mi, "Stick");
+   e_menu_item_check_set(mi, 1);
+   e_menu_item_toggle_set(mi, (bd->sticky ? 1 : 0));
    e_menu_item_callback_set(mi, _e_border_menu_cb_stick, bd);
 
    mi = e_menu_item_new(m);