diff --git a/ExplorerPatcher/GUI.c b/ExplorerPatcher/GUI.c
index bbc584e..cbed30d 100644
--- a/ExplorerPatcher/GUI.c
+++ b/ExplorerPatcher/GUI.c
@@ -205,7 +205,15 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
                             if (p)
                             {
                                 p--;
-                                *p = 0;
+                                if (p == L' ')
+                                {
+                                    *p = 0;
+                                }
+                                else
+                                {
+                                    p++;
+                                    *p = 0;
+                                }
                             }
                         }
                         rcText.bottom += GUI_CAPTION_LINE_HEIGHT - dwLineHeight;
diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
index b76fbde..1f79ae2 100644
--- a/ExplorerPatcher/dllmain.c
+++ b/ExplorerPatcher/dllmain.c
@@ -258,7 +258,15 @@ DWORD ShowLauncherTipContextMenu(
     if (p)
     {
         p--;
-        *p = 0;
+        if (p == L' ')
+        {
+            *p = 0;
+        }
+        else
+        {
+            p++;
+            *p = 0;
+        }
     }
 
     MENUITEMINFOW menuInfo;