diff --git a/src/DynamoCoreWpf/UI/Prompts/FunctionNamePrompt.xaml b/src/DynamoCoreWpf/UI/Prompts/FunctionNamePrompt.xaml
index e9613dea627..e0c6b354bf9 100644
--- a/src/DynamoCoreWpf/UI/Prompts/FunctionNamePrompt.xaml
+++ b/src/DynamoCoreWpf/UI/Prompts/FunctionNamePrompt.xaml
@@ -1,17 +1,15 @@
-<Window x:Class="Dynamo.Nodes.FunctionNamePrompt"
+<Window x:Class="Dynamo.Nodes.FunctionNamePrompt"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:p="clr-namespace:Dynamo.Wpf.Properties;assembly=DynamoCoreWpf"
         xmlns:ui="clr-namespace:Dynamo.UI"
         Title="{x:Static p:Resources.CustomNodePropertyWindowTitle}"
-        Width="450"
         WindowStartupLocation="CenterOwner"
-        WindowStyle="None">
-    <Window.Background>
-        <SolidColorBrush Opacity="0" />
-    </Window.Background>
-    <Window.AllowsTransparency>True</Window.AllowsTransparency>
-
+        Width="450"
+        Height="540"
+        AllowsTransparency="True"
+        WindowStyle="None"
+        Background="Transparent">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -231,6 +229,8 @@
         <Border Name="titleBar"
                 Grid.Row="0"
                 Grid.RowSpan="3"
+                BorderBrush="{StaticResource WorkspaceBackgroundHomeBrush}"
+                BorderThickness="1"
                 Background="{StaticResource DarkMidGreyBrush}"
                 CornerRadius="4"
                 MouseDown="FunctionNamePrompt_MouseDown">
@@ -379,5 +379,14 @@
                     Style="{DynamicResource ResourceKey=CtaButtonStyle}"
                     TabIndex="2" />
         </DockPanel>
+
+        <Border Name="frame"
+                Grid.Row="0"
+                Grid.RowSpan="3"
+                BorderBrush="{StaticResource WorkspaceBackgroundHomeBrush}"
+                BorderThickness="1"
+                Background="Transparent"
+                IsHitTestVisible="False"
+                CornerRadius="4"/>
     </Grid>
 </Window>
diff --git a/src/DynamoCoreWpf/UI/Prompts/FunctionNamePrompt.xaml.cs b/src/DynamoCoreWpf/UI/Prompts/FunctionNamePrompt.xaml.cs
index 45f1e41d28f..c67c5b62401 100644
--- a/src/DynamoCoreWpf/UI/Prompts/FunctionNamePrompt.xaml.cs
+++ b/src/DynamoCoreWpf/UI/Prompts/FunctionNamePrompt.xaml.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
@@ -32,6 +32,7 @@ public FunctionNamePrompt(IEnumerable<string> categories)
                 categoryBox.Items.Add(item);
             }
         }
+       
 
         void OK_Click(object sender, RoutedEventArgs e)
         {
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
index dd79b7af0fd..26692f390e7 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -1726,8 +1726,6 @@ internal void ShowNewFunctionDialog(FunctionNamePromptEventArgs e)
                 categoryBox = { Text = e.Category },
                 DescriptionInput = { Text = e.Description },
                 nameBox = { Text = e.Name },
-                Owner = this,
-                WindowStartupLocation = WindowStartupLocation.CenterOwner
             };
 
             if (e.CanEditName)