diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 2fb9f69f0..4c8e978e0 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -1365,9 +1365,11 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_main,
 
    if ((gcc->gadcon->shelf) || (gcc->gadcon->toolbar))
      {
-        mi = e_menu_item_new(menu_gadget);
-        e_menu_item_separator_set(mi, 1);
-
+        if (e_menu_item_nth(menu_gadget, 0))
+          {
+             mi = e_menu_item_new(menu_gadget);
+             e_menu_item_separator_set(mi, 1);
+          }
 	if (!gcc->o_control) 
 	  {
              mi = e_menu_item_new(menu_gadget);
diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c
index 5afacc2ec..8f566752f 100644
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -701,8 +701,11 @@ _attach_menu(void *data __UNUSED__, E_Gadcon_Client *gcc, E_Menu *menu)
    //printf("Attach menu (gcc: %x id: %s) [%s]\n", gcc, gcc->cf->id, gcc->cf->style);
    if (!gcc) return;
 
-   mi = e_menu_item_new(menu);
-   e_menu_item_separator_set(mi, 1);
+   if (e_menu_item_nth(menu, 0))
+     {
+        mi = e_menu_item_new(menu);
+        e_menu_item_separator_set(mi, 1);
+     }
 
    /* Move / resize*/
    mi = e_menu_item_new(menu);