diff --git a/src/Libraries/PythonNodeModels/Properties/Resources.Designer.cs b/src/Libraries/PythonNodeModels/Properties/Resources.Designer.cs
index 1966e33f0c6..5cbe491dfee 100644
--- a/src/Libraries/PythonNodeModels/Properties/Resources.Designer.cs
+++ b/src/Libraries/PythonNodeModels/Properties/Resources.Designer.cs
@@ -196,7 +196,7 @@ public static string PythonScriptEditorInputComment {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Migration Assistant to update your Python 2 scripts to Python 3..
+        ///   Looks up a localized string similar to Migration Assistant to update your Python 2 scripts to Python 3. Engine must be set to Python 2 version to work..
         /// </summary>
         public static string PythonScriptEditorMigrationAssistantButtonTooltip {
             get {
diff --git a/src/Libraries/PythonNodeModels/Properties/Resources.en-US.resx b/src/Libraries/PythonNodeModels/Properties/Resources.en-US.resx
index b32205c7eeb..3cb9344a970 100644
--- a/src/Libraries/PythonNodeModels/Properties/Resources.en-US.resx
+++ b/src/Libraries/PythonNodeModels/Properties/Resources.en-US.resx
@@ -191,7 +191,7 @@
     <value>Use this dropdown to choose the python version/engine to execute your code.</value>
   </data>
   <data name="PythonScriptEditorMigrationAssistantButtonTooltip" xml:space="preserve">
-    <value>Migration Assistant to update your Python 2 scripts to Python 3.</value>
+    <value>Migration Assistant to update your Python 2 scripts to Python 3. Engine must be set to Python 2 version to work.</value>
   </data>
   <data name="PythonSearchTags" xml:space="preserve">
     <value>IronPython;CPython;</value>
diff --git a/src/Libraries/PythonNodeModels/Properties/Resources.resx b/src/Libraries/PythonNodeModels/Properties/Resources.resx
index 4811e73518c..36082939c9b 100644
--- a/src/Libraries/PythonNodeModels/Properties/Resources.resx
+++ b/src/Libraries/PythonNodeModels/Properties/Resources.resx
@@ -192,7 +192,7 @@
     <value>Use this dropdown to choose the python version/engine to execute your code.</value>
   </data>
   <data name="PythonScriptEditorMigrationAssistantButtonTooltip" xml:space="preserve">
-    <value>Migration Assistant to update your Python 2 scripts to Python 3.</value>
+    <value>Migration Assistant to update your Python 2 scripts to Python 3. Engine must be set to Python 2 version to work.</value>
   </data>
   <data name="PythonSearchTags" xml:space="preserve">
     <value>IronPython;CPython;</value>
diff --git a/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj b/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj
index cffe0187fde..b23662fa86f 100644
--- a/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj
+++ b/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj
@@ -114,6 +114,7 @@
       <DependentUpon>ScriptEditorWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="SharedCompletionProvider.cs" />
+    <Compile Include="ValueConverter.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\DynamoCoreWpf\DynamoCoreWpf.csproj">
diff --git a/src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml b/src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml
index 674ffaf866d..58171806f66 100644
--- a/src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml
+++ b/src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml
@@ -6,7 +6,7 @@
                          xmlns:dww="clr-namespace:Dynamo.Wpf.Windows;assembly=DynamoCoreWpf"
                          xmlns:avalonedit="clr-namespace:ICSharpCode.AvalonEdit;assembly=ICSharpCode.AvalonEdit"
                          xmlns:p="clr-namespace:PythonNodeModels.Properties;assembly=PythonNodeModels"
-                         xmlns:pythonNodeModel="clr-namespace:PythonNodeModels;assembly=PythonNodeModels"
+                         xmlns:pw="clr-namespace:PythonNodeModelsWpf"
                          xmlns:sys="clr-namespace:System;assembly=mscorlib"
                          Title="{Binding nodeModel.Name, Mode=OneWay, RelativeSource={RelativeSource Self}}"
                          Height="500"
@@ -56,6 +56,7 @@
                 <Setter Property="Foreground"
                         Value="#bbbbbb" />
             </Style>
+            <pw:SelectedPythonEngineToMigrationConverter x:Key="SelectedPythonEngineToMigrationConverter" />
         </ResourceDictionary>
 
     </Window.Resources>
@@ -105,7 +106,10 @@
             <Button Style="{StaticResource IconButton}"
                     Name="MigrationAssistantBtn"
                     Click="OnMigrationAssistantClicked"
-                    ToolTip="{x:Static p:Resources.PythonScriptEditorMigrationAssistantButtonTooltip}">
+                    ToolTip="{x:Static p:Resources.PythonScriptEditorMigrationAssistantButtonTooltip}"
+                    ToolTipService.ShowOnDisabled="True"
+                    ToolTipService.IsEnabled="True"
+                    IsEnabled="{Binding SelectedItem, ElementName=EngineSelectorComboBox, Converter={StaticResource SelectedPythonEngineToMigrationConverter}}">
                 <Button.Resources>
                     <Image x:Key="Shape"
                            Width="44"
diff --git a/src/Libraries/PythonNodeModelsWpf/ValueConverter.cs b/src/Libraries/PythonNodeModelsWpf/ValueConverter.cs
new file mode 100644
index 00000000000..7113f1772e0
--- /dev/null
+++ b/src/Libraries/PythonNodeModelsWpf/ValueConverter.cs
@@ -0,0 +1,24 @@
+using PythonNodeModels;
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace PythonNodeModelsWpf
+{
+    public class SelectedPythonEngineToMigrationConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return false;
+            }
+            return (PythonEngineVersion)value == PythonEngineVersion.IronPython2;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}