diff --git a/neofetch b/neofetch
index f0419257..ee65e4c2 100755
--- a/neofetch
+++ b/neofetch
@@ -663,11 +663,14 @@ get_wm() {
 
     if [[ -n "$DISPLAY" && "$os" != "Mac OS X" ]]; then
         id="$(xprop -root -notype | awk '$1=="_NET_SUPPORTING_WM_CHECK:"{print $5}')"
-        wm="$(xprop -id "$id" -notype -f _NET_WM_NAME 8t)"
+        wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)"
         wm="${wm/*_NET_WM_NAME = }"
         wm="${wm/\"}"
         wm="${wm/\"*}"
 
+        # Window Maker does not set _NET_WM_NAME
+        [[ "$wm" =~ "WINDOWMAKER" ]] && wm="wmaker"
+
         # Fallback for Wayland wms.
         [[ "$wm" == "xwlc" ]] && \
             wm="$(ps -e | grep -m 1 -o -F -e "sway" -e "orbment" -e "velox" -e "orbital")"