diff --git a/src/ewmh.c b/src/ewmh.c
index 9770174..76fb261 100644
--- a/src/ewmh.c
+++ b/src/ewmh.c
@@ -137,14 +137,7 @@ ewmh_update_current_tag_prop(void)
      XChangeProperty(dpy, ROOT, net_atom[wmfs_nmaster], XA_CARDINAL, 32,
                      PropModeReplace, (uchar*)&tags[selscreen][t + 1].nmaster, 1);
 
-     return;
-}
-
-/** Manage _WMFS_CURRENT_LAYOUT
-*/
-void
-ewmh_get_current_layout(void)
-{
+     /* Current layout */
      XChangeProperty(dpy, ROOT, net_atom[wmfs_current_layout], XA_STRING, 8,
                      PropModeReplace, (uchar*)tags[selscreen][seltag[selscreen]].layout.symbol,
                      strlen(tags[selscreen][seltag[selscreen]].layout.symbol));
@@ -152,7 +145,6 @@ ewmh_get_current_layout(void)
      return;
 }
 
-
 /** Get _NET_CLIENT_LIST
 */
 void
diff --git a/src/layout.c b/src/layout.c
index cdb768c..3ab8b0b 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -71,7 +71,7 @@ freelayout(int screen)
                c->tile = c->lmax = False;
           }
 
-     ewmh_get_current_layout();
+     ewmh_update_current_tag_prop();
 
      return;
 }
@@ -103,7 +103,8 @@ layoutswitch(Bool b)
                break;
           }
      }
-     ewmh_get_current_layout();
+
+     ewmh_update_current_tag_prop();
      tags[selscreen][seltag[selscreen]].layout.func(selscreen);
      infobar_draw(selscreen);
 
@@ -146,7 +147,7 @@ maxlayout(int screen)
           client_maximize(c);
      }
 
-     ewmh_get_current_layout();
+     ewmh_update_current_tag_prop();
 
      return;
 }
@@ -268,7 +269,7 @@ grid(int screen)
           }
      }
 
-     ewmh_get_current_layout();
+     ewmh_update_current_tag_prop();
 
      return;
 }
@@ -397,7 +398,6 @@ multi_tile(int screen, Position type)
                cgeo.y = c->geo.y + c->geo.height + BORDH + TBARH;
      }
 
-     ewmh_get_current_layout();
      ewmh_update_current_tag_prop();
 
      return;
@@ -576,7 +576,6 @@ mirror(int screen, Bool horizontal)
 
      }
 
-     ewmh_get_current_layout();
      ewmh_update_current_tag_prop();
 
      return;
diff --git a/src/wmfs.h b/src/wmfs.h
index b977327..3a857f6 100644
--- a/src/wmfs.h
+++ b/src/wmfs.h
@@ -160,7 +160,6 @@ void uicb_client_kill(uicb_t);
 void ewmh_init_hints(void);
 void ewmh_get_number_of_desktop(void);
 void ewmh_update_current_tag_prop(void);
-void ewmh_get_current_layout(void);
 void ewmh_get_client_list(void);
 void ewmh_get_desktop_names(void);
 void ewmh_set_desktop_geometry(void);