diff --git a/samples/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesCommand.cs b/samples/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesCommand.cs
index 9dcc18fa22..aba3fb47ed 100644
--- a/samples/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesCommand.cs
+++ b/samples/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesCommand.cs
@@ -3,6 +3,7 @@
 
 using System;
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.PInvokeAddIn
@@ -20,7 +21,7 @@ namespace ICSharpCode.PInvokeAddIn
 		{
 			// Show PInvoke dialog.
 			using(InsertPInvokeSignaturesForm form = new InsertPInvokeSignaturesForm()) {
-				form.ShowDialog(WorkbenchSingleton.MainWin32Window);
+				form.ShowDialog(SD.WinForms.MainWin32Window);
 			}
 		}
 	}
diff --git a/samples/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesForm.cs b/samples/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesForm.cs
index ce93f43df7..e541e5ef16 100644
--- a/samples/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesForm.cs
+++ b/samples/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesForm.cs
@@ -8,6 +8,7 @@ using System.Text;
 using System.Windows.Forms;
 
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
 using ICSharpCode.PInvokeAddIn.WebServices;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Gui;
@@ -140,7 +141,7 @@ namespace ICSharpCode.PInvokeAddIn
 			string signature = GetSelectedPInvokeSignature(language);
 			
 			if (signature.Length > 0) {
-				ITextEditor textEditor = GetTextEditor();
+				ITextEditor textEditor = SD.GetActiveViewContentService<ITextEditor>();
 				if (textEditor != null) {
 					generator.Generate(textEditor, signature);
 				}
@@ -242,7 +243,7 @@ namespace ICSharpCode.PInvokeAddIn
 
 		string GetSourceFileLanguage()
 		{
-			ITextEditor textEditor = GetTextEditor();
+			ITextEditor textEditor = SD.GetActiveViewContentService<ITextEditor>();
 			if (textEditor != null) {
 				string fileExtension = Path.GetExtension(textEditor.FileName);
 				if (fileExtension.Equals(".vb", StringComparison.OrdinalIgnoreCase)) {
@@ -280,14 +281,5 @@ namespace ICSharpCode.PInvokeAddIn
 				}
 			}
 		}
-		
-		static ITextEditor GetTextEditor()
-		{
-			ITextEditorProvider provider = WorkbenchSingleton.Workbench.ActiveViewContent as ITextEditorProvider;
-			if (provider != null)
-				return provider.TextEditor;
-			else
-				return null;
-		}
 	}
 }