diff --git a/src/DynamoCoreWpf/Views/Preview/InfoBubbleView.xaml b/src/DynamoCoreWpf/Views/Preview/InfoBubbleView.xaml
index 78ba04e3a44..0ef9d17938b 100644
--- a/src/DynamoCoreWpf/Views/Preview/InfoBubbleView.xaml
+++ b/src/DynamoCoreWpf/Views/Preview/InfoBubbleView.xaml
@@ -164,12 +164,22 @@
                                                                             <ColumnDefinition Width="30" />
                                                                         </Grid.ColumnDefinitions>
                                                                         <!--  Displays the warning message  -->
-                                                                        <TextBlock LineHeight="14px" TextWrapping="Wrap">
-                                                                            <TextBlock.Inlines>
-                                                                                <Run FontFamily="{StaticResource ArtifaktElementBold}" Text="{Binding MessageNumber, UpdateSourceTrigger=PropertyChanged}" />
-                                                                                <Run Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}" />
-                                                                            </TextBlock.Inlines>
-                                                                        </TextBlock>
+                                                                        <Grid>
+                                                                            <!-- TextBox for the numbering -->
+                                                                            <TextBox Text="{Binding MessageNumber, UpdateSourceTrigger=PropertyChanged}"
+                                                                                     FontFamily="{StaticResource ArtifaktElementBold}"
+                                                                                     IsReadOnly="True"
+                                                                                     Background="Transparent"
+                                                                                     BorderThickness="0"/>
+                                                                            <!-- TextBox for the message description -->
+                                                                            <TextBox Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}"
+                                                                                     FontFamily="{StaticResource ArtifaktElementRegular}"
+                                                                                     TextWrapping="Wrap"
+                                                                                     IsReadOnly="True"
+                                                                                     Background="Transparent"
+                                                                                     BorderThickness="0"
+                                                                                     Margin="30,0,0,0"/>
+                                                                        </Grid>
                                                                     </Grid>
                                                                     <Button Name="LearnMoreErrorsButton"
                                                                             Margin="-2,4,0,0"
@@ -221,11 +231,11 @@
                                                                             <ColumnDefinition Width="30" />
                                                                         </Grid.ColumnDefinitions>
                                                                         <!--  Displays the warning message  -->
-                                                                        <TextBlock LineHeight="14px" TextWrapping="Wrap">
-                                                                            <TextBlock.Inlines>
-                                                                                <Run Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}" />
-                                                                            </TextBlock.Inlines>
-                                                                        </TextBlock>
+                                                                        <TextBox IsReadOnly="True"
+                                                                                 Background="Transparent"
+                                                                                 BorderThickness="0"
+                                                                                 TextWrapping="Wrap"
+                                                                                 Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}" />
                                                                     </Grid>
                                                                     <Button Name="LearnMoreErrorsButton"
                                                                             Margin="-2,4,0,0"
@@ -394,12 +404,22 @@
                                                                             <ColumnDefinition Width="30" />
                                                                         </Grid.ColumnDefinitions>
                                                                         <!--  Displays the warning message  -->
-                                                                        <TextBlock LineHeight="14px" TextWrapping="Wrap">
-                                                                            <TextBlock.Inlines>
-                                                                                <Run FontFamily="{StaticResource ArtifaktElementBold}" Text="{Binding MessageNumber, UpdateSourceTrigger=PropertyChanged}" />
-                                                                                <Run Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}" />
-                                                                            </TextBlock.Inlines>
-                                                                        </TextBlock>
+                                                                        <Grid>
+                                                                            <!-- TextBox for the numbering -->
+                                                                            <TextBox Text="{Binding MessageNumber, UpdateSourceTrigger=PropertyChanged}"
+                                                                                     FontFamily="{StaticResource ArtifaktElementBold}"
+                                                                                     IsReadOnly="True"
+                                                                                     Background="Transparent"
+                                                                                     BorderThickness="0"/>
+                                                                            <!-- TextBox for the message description -->
+                                                                            <TextBox Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}"
+                                                                                     FontFamily="{StaticResource ArtifaktElementRegular}"
+                                                                                     TextWrapping="Wrap"
+                                                                                     IsReadOnly="True"
+                                                                                     Background="Transparent"
+                                                                                     BorderThickness="0"
+                                                                                     Margin="30,0,0,0"/>
+                                                                        </Grid>
                                                                         <Button Name="DismissMessageButton"
                                                                                 Grid.Column="1"
                                                                                 Width="13"
@@ -466,11 +486,11 @@
                                                                             <ColumnDefinition Width="30" />
                                                                         </Grid.ColumnDefinitions>
                                                                         <!--  Displays the warning message  -->
-                                                                        <TextBlock LineHeight="14px" TextWrapping="Wrap">
-                                                                            <TextBlock.Inlines>
-                                                                                <Run Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}" />
-                                                                            </TextBlock.Inlines>
-                                                                        </TextBlock>
+                                                                        <TextBox IsReadOnly="True"
+                                                                                 Background="Transparent"
+                                                                                 BorderThickness="0"
+                                                                                 TextWrapping="Wrap"
+                                                                                 Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}" />
                                                                         <Button Name="DismissMessageButton"
                                                                                 Grid.Column="1"
                                                                                 Width="13"
@@ -669,12 +689,22 @@
                                                                             <ColumnDefinition Width="30" />
                                                                         </Grid.ColumnDefinitions>
                                                                         <!--  Displays the warning message  -->
-                                                                        <TextBlock LineHeight="14px" TextWrapping="Wrap">
-                                                                            <TextBlock.Inlines>
-                                                                                <Run FontFamily="{StaticResource ArtifaktElementBold}" Text="{Binding MessageNumber, UpdateSourceTrigger=PropertyChanged}" />
-                                                                                <Run Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}" />
-                                                                            </TextBlock.Inlines>
-                                                                        </TextBlock>
+                                                                        <Grid>
+                                                                            <!-- TextBox for the numbering -->
+                                                                            <TextBox Text="{Binding MessageNumber, UpdateSourceTrigger=PropertyChanged}"
+                                                                                     FontFamily="{StaticResource ArtifaktElementBold}"
+                                                                                     IsReadOnly="True"
+                                                                                     Background="Transparent"
+                                                                                     BorderThickness="0"/>
+                                                                            <!-- TextBox for the message description -->
+                                                                            <TextBox Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}"
+                                                                                     FontFamily="{StaticResource ArtifaktElementRegular}"
+                                                                                     TextWrapping="Wrap"
+                                                                                     IsReadOnly="True"
+                                                                                     Background="Transparent"
+                                                                                     BorderThickness="0"
+                                                                                     Margin="30,0,0,0"/>
+                                                                        </Grid>
                                                                         <Button Name="DismissMessageButton"
                                                                                 Grid.Column="1"
                                                                                 Width="13"
@@ -737,11 +767,11 @@
                                                                             <ColumnDefinition Width="30" />
                                                                         </Grid.ColumnDefinitions>
                                                                         <!--  Displays the warning message  -->
-                                                                        <TextBlock LineHeight="14px" TextWrapping="Wrap">
-                                                                            <TextBlock.Inlines>
-                                                                                <Run Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}" />
-                                                                            </TextBlock.Inlines>
-                                                                        </TextBlock>
+                                                                        <TextBox IsReadOnly="True"
+                                                                                 Background="Transparent"
+                                                                                 BorderThickness="0"
+                                                                                 TextWrapping="Wrap"
+                                                                                 Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}" />
                                                                         <Button Name="DismissMessageButton"
                                                                                 Grid.Column="1"
                                                                                 Width="13"
diff --git a/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml b/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml
index 3e2a15b9904..fe0760e7a69 100644
--- a/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml
+++ b/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml
@@ -352,19 +352,23 @@
                             </TextBlock.Style>
                         </TextBlock>
 
-                        <TextBlock Width="Auto"
-                                   Margin="{Binding Path=IsTopLevel, Converter={StaticResource TopLevelLabelMarginConverter}}"
-                                   VerticalAlignment="Center"                                                                      
-                                   FontFamily="{StaticResource SourceCodePro}"
-                                   Text="{Binding Path=NodeLabel}"
-                                   Visibility="{Binding Path=NodeLabel, Converter={StaticResource EmptyStringToCollapsedConverter}}" >
+                        <TextBox Width="Auto"
+                                 Margin="{Binding Path=IsTopLevel, Converter={StaticResource TopLevelLabelMarginConverter}}"
+                                 VerticalAlignment="Center"
+                                 FontFamily="{StaticResource SourceCodePro}"
+                                 Text="{Binding Path=NodeLabel}"
+                                 Visibility="{Binding Path=NodeLabel, Converter={StaticResource EmptyStringToCollapsedConverter}}"
+                                 IsReadOnly="True"
+                                 Background="Transparent"
+                                 BorderThickness="0"
+                                 TextWrapping="Wrap">
                             <TextBlock.Foreground>
                                 <MultiBinding Converter="{StaticResource ObjectTypeConverter}">
                                     <Binding Path="ValueType" />
                                     <Binding Path="NodeLabel" />
-                                    </MultiBinding>
+                                </MultiBinding>
                             </TextBlock.Foreground>
-                            </TextBlock>
+                        </TextBox>
 
                         <Button Margin="10,2,2,2"
                                 Padding="4,0,4,0"
diff --git a/test/DynamoCoreWpfTests/NodeViewCustomizationTests.cs b/test/DynamoCoreWpfTests/NodeViewCustomizationTests.cs
index 7d3ceabbba1..2aaae5a5534 100644
--- a/test/DynamoCoreWpfTests/NodeViewCustomizationTests.cs
+++ b/test/DynamoCoreWpfTests/NodeViewCustomizationTests.cs
@@ -292,8 +292,12 @@ public void WatchContainsExpectedUiElements()
             var tree = nodeView.ChildrenOfType<WatchTree>();
             Assert.AreEqual(1, tree.Count());
 
-            var items = tree.First().treeView1.ChildrenOfType<TextBlock>();
-            Assert.AreEqual(8, items.Count());
+            // text block for list indexes
+            var textBlocks = tree.First().treeView1.ChildrenOfType<TextBlock>();
+            Assert.AreEqual(4, textBlocks.Count());
+            // text boxes for list items
+            var textBoxes = tree.First().treeView1.ChildrenOfType<TextBox>();
+            Assert.AreEqual(4, textBoxes.Count());
         }
 
         [Test, Category("DisplayHardwareDependent")]
@@ -437,7 +441,12 @@ public void WatchConnectDisconnectTest()
 
             var items = tree.First().treeView1.ChildrenOfType<TextBlock>();
             // watch is computed with cbn and has its value
-            Assert.AreEqual(8, items.Count());
+            // text block for list indexes
+            var textBlocks = tree.First().treeView1.ChildrenOfType<TextBlock>();
+            Assert.AreEqual(4, textBlocks.Count());
+            // text boxes for list items
+            var textBoxes = tree.First().treeView1.ChildrenOfType<TextBox>();
+            Assert.AreEqual(4, textBoxes.Count());
 
             // disconnect watch
             Model.ExecuteCommand(new DynamoModel.MakeConnectionCommand(watchGuid, 0, PortType.Input,
@@ -464,8 +473,10 @@ public void WatchConnectDisconnectTest()
             Run();
             DispatcherUtil.DoEvents();
             tree = nodeView.ChildrenOfType<WatchTree>();
-            items = tree.First().treeView1.ChildrenOfType<TextBlock>();
-            Assert.AreEqual(8, items.Count());
+            textBlocks = tree.First().treeView1.ChildrenOfType<TextBlock>();
+            Assert.AreEqual(4, textBlocks.Count());
+            textBoxes = tree.First().treeView1.ChildrenOfType<TextBox>();
+            Assert.AreEqual(4, textBoxes.Count());
         }
 
         [Test]