diff --git a/src/desktops.c b/src/desktops.c
index c8f28122..7e0cd064 100644
--- a/src/desktops.c
+++ b/src/desktops.c
@@ -899,6 +899,7 @@ ChangeNumberOfDesktops(unsigned int quantity)
       DeskGotoNum(Conf.desks.num - 1);
 
    HintsSetDesktopConfig();
+   HintsSetDesktopNames();
 
    autosave();
 }
@@ -2357,6 +2358,7 @@ DesksInit(void)
    EHintsGetDeskInfo();
 
    HintsSetDesktopConfig();
+   HintsSetDesktopNames();
    HintsSetDesktopViewport();
 }
 
diff --git a/src/hints.c b/src/hints.c
index cdc557a3..84d08b58 100644
--- a/src/hints.c
+++ b/src/hints.c
@@ -91,12 +91,17 @@ HintsSetClientStacking(void)
    EWMH_SetClientStacking();
 }
 
+void
+HintsSetDesktopNames(void)
+{
+   EWMH_SetDesktopNames();
+}
+
 void
 HintsSetDesktopConfig(void)
 {
    EWMH_SetDesktopCount();
    EWMH_SetDesktopRoots();
-   EWMH_SetDesktopNames();
    EWMH_SetWorkArea();
 }
 
diff --git a/src/hints.h b/src/hints.h
index 5b7f5621..b1cc7bc3 100644
--- a/src/hints.h
+++ b/src/hints.h
@@ -57,6 +57,7 @@ int                 EWMH_ProcessRootClientMessage(XClientMessageEvent * event);
 
 /* hints.c */
 void                HintsInit(void);
+void                HintsSetDesktopNames(void);
 void                HintsSetDesktopConfig(void);
 void                HintsSetViewportConfig(void);
 void                HintsSetCurrentDesktop(void);