diff --git a/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs b/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
index a394e930c2..631f514ff8 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
@@ -271,7 +271,11 @@ namespace ICSharpCode.SharpDevelop.Debugging
 				}
 				if (toolTipText != null) {
 					if (debuggerCanShowValue && currentDebugger != null) {
-						e.SetToolTip(currentDebugger.GetTooltipControl(expressionResult.Expression));
+						object toolTip = currentDebugger.GetTooltipControl(expressionResult.Expression);
+						if (toolTip != null)
+							e.SetToolTip(toolTip);
+						else
+							e.SetToolTip(toolTipText);
 					} else {
 						e.SetToolTip(toolTipText);
 					}