diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c
index 07c83d151cb..0380ac9e7a4 100644
--- a/dlls/shell32/shelllink.c
+++ b/dlls/shell32/shelllink.c
@@ -613,7 +613,7 @@ static LPWSTR Stream_LoadPath( LPCSTR p, DWORD maxlen )
     int len = 0, wlen;
     LPWSTR path;
 
-    while( p[len] && (len < maxlen) )
+    while( (len < maxlen) && p[len] )
         len++;
 
     wlen = MultiByteToWideChar(CP_ACP, 0, p, len, NULL, 0);
diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c
index 622ef34623c..781902a2384 100644
--- a/dlls/shell32/xdg.c
+++ b/dlls/shell32/xdg.c
@@ -341,7 +341,7 @@ static int dskentry_decode(const char *value, int len, char *output)
     while (pos<len)
     {
         char c;
-        if (value[pos] == '\\' && pos<len-1)
+        if (pos<len-1 && value[pos] == '\\')
         {
             pos++;
             switch (value[pos])