diff --git a/SharpShell/SharpShell/SharpPreviewHandler/PreviewHandlerControl.cs b/SharpShell/SharpShell/SharpPreviewHandler/PreviewHandlerControl.cs
index 3e83e68f..6c850e32 100644
--- a/SharpShell/SharpShell/SharpPreviewHandler/PreviewHandlerControl.cs
+++ b/SharpShell/SharpShell/SharpPreviewHandler/PreviewHandlerControl.cs
@@ -6,16 +6,8 @@ namespace SharpShell.SharpPreviewHandler
     /// <summary>
     /// Base class for preview handler controls.
     /// </summary>
-    public class PreviewHandlerControl : Form
+    public class PreviewHandlerControl : UserControl
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PreviewHandlerControl"/> class.
-        /// </summary>
-        protected PreviewHandlerControl()
-        {
-            FormBorderStyle = FormBorderStyle.None;
-        }
-
         /// <summary>
         /// Sets the color of the background, if possible, to coordinate with the windows
         /// color scheme.
diff --git a/SharpShell/SharpShell/SharpPreviewHandler/PreviewHandlerHost.cs b/SharpShell/SharpShell/SharpPreviewHandler/PreviewHandlerHost.cs
index b6b6f7a8..69bc53db 100644
--- a/SharpShell/SharpShell/SharpPreviewHandler/PreviewHandlerHost.cs
+++ b/SharpShell/SharpShell/SharpPreviewHandler/PreviewHandlerHost.cs
@@ -13,7 +13,7 @@ namespace SharpShell.SharpPreviewHandler
     /// The PreviewHandlerHost is the window created in the preview 
     /// pane which will hold the derived preview handlers UI.
     /// </summary>
-    internal class PreviewHandlerHost : UserControl
+    internal class PreviewHandlerHost : Form
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PreviewHandlerHost"/> class.
@@ -23,6 +23,8 @@ public PreviewHandlerHost()
             //  Initialize the component.
             InitializeComponent();
 
+            FormBorderStyle = FormBorderStyle.None;
+
             //  Invisible by default.
             Visible = false;
         }