diff --git a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml
index 5cfebc827f..7752bc8bb0 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml
+++ b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml
@@ -234,6 +234,10 @@
 				Height="0"
 				MaxHeight="50">
 				<TextBox
+					FontFamily="Khmer UI"
+					BorderBrush="Gray"
+					BorderThickness="1"
+					FontSize="12"
 					Name="CommentTextBox"
 					TextChanged="CommentTextBox_TextChanged"
 					Margin="3"/>
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml.cs
index 6512f4f900..40ddb22bf3 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml.cs
+++ b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml.cs
@@ -324,7 +324,7 @@ namespace Debugger.AddIn.Tooltips
 				return;
 			
 			var resultNode = currentDebugger.GetNode(node.FullName, node.ImageName);
-			if (resultNode == null) 
+			if (resultNode == null)
 				return;
 			// HACK for updating the pins in tooltip
 			var observable = new ObservableCollection<ITreeNode>();