diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeBase.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeBase.java
index c5f730109d16..7e81ee69ff54 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeBase.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeBase.java
@@ -121,13 +121,16 @@ public class DebuggerTreeBase extends DnDAwareTree implements Disposable {
         }
 
         if (tipText.length() > 0) {
-          final StringTokenizer tokenizer = new StringTokenizer(tipText, "\n", true);
+          final StringTokenizer tokenizer = new StringTokenizer(tipText, "\n ", true);
 
           while (tokenizer.hasMoreElements()) {
             final String each = tokenizer.nextElement();
             if ("\n".equals(each)) {
               tipBuilder.append("<br>");
             }
+            else if (" ".equals(each)) {
+              tipBuilder.append("&nbsp ");
+            }
             else {
               tipBuilder.append(JDOMUtil.legalizeText(each));
             }