diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
index cfd33befbed..da7d03b0450 100644
--- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj
+++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -157,6 +157,7 @@
     </Compile>
     <Compile Include="Controls\UseLevelPopup.cs" />
     <Compile Include="Controls\UseLevelSpinner.cs" />
+    <Compile Include="Extensions\ViewModelCommandExecutive.cs" />
     <Compile Include="Extensions\IViewExtension.cs" />
     <Compile Include="Extensions\IViewExtensionLoader.cs" />
     <Compile Include="Extensions\IViewExtensionManager.cs" />
diff --git a/src/DynamoCoreWpf/Extensions/ViewLoadedParams.cs b/src/DynamoCoreWpf/Extensions/ViewLoadedParams.cs
index 948d8064f41..11986ba7359 100644
--- a/src/DynamoCoreWpf/Extensions/ViewLoadedParams.cs
+++ b/src/DynamoCoreWpf/Extensions/ViewLoadedParams.cs
@@ -9,6 +9,7 @@
 using Dynamo.Utilities;
 using Dynamo.ViewModels;
 using Dynamo.Visualization;
+using Dynamo.Wpf.ViewModels;
 using Dynamo.Wpf.ViewModels.Watch3D;
 
 namespace Dynamo.Wpf.Extensions
@@ -54,6 +55,15 @@ public IPackageInstaller PackageInstaller
             get { return dynamoViewModel.PackageManagerClientViewModel; }
         }
 
+        private ViewModelCommandExecutive viewModelCommandExecutive;
+        /// <summary>
+        /// Class used for executing commands on the DynamoViewModel and current WorkspaceViewModel
+        /// </summary>
+        public ViewModelCommandExecutive ViewModelCommandExecutive
+        {
+            get { return viewModelCommandExecutive ?? (viewModelCommandExecutive = new ViewModelCommandExecutive(dynamoViewModel)); }
+        }
+
         /// <summary>
         /// A reference to the Dynamo Window object. Useful for correctly setting the parent of a 
         /// newly created window.
diff --git a/src/DynamoCoreWpf/Extensions/ViewModelCommandExecutive.cs b/src/DynamoCoreWpf/Extensions/ViewModelCommandExecutive.cs
new file mode 100644
index 00000000000..5d4c8668dbf
--- /dev/null
+++ b/src/DynamoCoreWpf/Extensions/ViewModelCommandExecutive.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Dynamo.ViewModels;
+
+namespace Dynamo.Wpf.Extensions
+{
+    /// <summary>
+    /// The ViewModelCommandExecutive provides access to DynamoViewModel and WorkspaceViewModel commands
+    /// </summary>
+    public class ViewModelCommandExecutive
+    {
+        private DynamoViewModel dynamoViewModel;
+
+        /// <summary>
+        /// Create a Command Executive for a DynamoViewModel
+        /// </summary>
+        /// <param name="viewModel"></param>
+        internal ViewModelCommandExecutive(DynamoViewModel viewModel)
+        {
+            dynamoViewModel = viewModel;
+        }
+
+        /// <summary>
+        /// Fit the current workspace view to the current selection
+        /// </summary>
+        public void FitViewCommand()
+        {
+            dynamoViewModel.FitViewCommand.Execute(null);
+        }
+
+        /// <summary>
+        /// Search for an element by its ID and focus the view on it
+        /// </summary>
+        /// <param name="objectID"></param>
+        public void FindByIdCommand(string objectID)
+        {
+            dynamoViewModel.CurrentSpaceViewModel.FindByIdCommand.Execute(objectID);
+        }
+
+        /// <summary>
+        /// Force re-execute all nodes in the current workspace
+        /// </summary>
+        /// <param name="showErrors">Should errors be shown?</param>
+        public void ForceRunExpressionCommand(bool showErrors = true)
+        {
+            dynamoViewModel.ForceRunExpressionCommand.Execute(showErrors);
+        }
+    }
+}
diff --git a/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs b/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs
index e0c7b20f312..e9406348e40 100644
--- a/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs
@@ -837,12 +837,11 @@ internal void CenterViewOnElement(object sender, EventArgs e)
 
                         double deltaX = nodeCenterInOverlay.X - outerCenter.X;
                         double deltaY = nodeCenterInOverlay.Y - outerCenter.Y;
+                        
+                        vm.Model.X -= deltaX;
+                        vm.Model.Y -= deltaY;
 
-                        //var offset = new Point(vm.CurrentOffset.X - deltaX, vm.CurrentOffset.Y - deltaY);
-
-                        //vm.CurrentOffset = offset;
-
-                        zoomBorder.SetTranslateTransformOrigin(new Point2D(vm.Model.X - deltaX, vm.Model.Y - deltaY));
+                        zoomBorder.SetTranslateTransformOrigin(new Point2D(vm.Model.X, vm.Model.Y));
                     }
                 });
         }