diff --git a/src/icon.c b/src/icon.c
index b5bb3089..b811a4f6 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -325,10 +325,12 @@ void wIconChangeTitle(WIcon *icon, WWindow *wwin)
 	if (icon->icon_name != NULL)
 		XFree(icon->icon_name);
 
-	/* Set the new one, using two methods */
+	/* Set the new one, using two methods to identify
+	the icon name or switch back to window name */
 	icon->icon_name = wNETWMGetIconName(wwin->client_win);
 	if (!icon->icon_name)
-		wGetIconName(dpy, wwin->client_win, &icon->icon_name);
+		if (!wGetIconName(dpy, wwin->client_win, &icon->icon_name))
+			icon->icon_name = wNETWMGetWindowName(wwin->client_win);
 }
 
 RImage *wIconValidateIconSize(RImage *icon, int max_size)