diff --git a/Src/SwqlStudio/MainForm.Designer.cs b/Src/SwqlStudio/MainForm.Designer.cs
index 95b06e202..ad1789894 100644
--- a/Src/SwqlStudio/MainForm.Designer.cs
+++ b/Src/SwqlStudio/MainForm.Designer.cs
@@ -655,8 +655,8 @@ private void InitializeComponent()
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(827, 595);
-            this.Controls.Add(this.mainToolbar);
             this.Controls.Add(this.filesDock);
+            this.Controls.Add(this.mainToolbar);
             this.Controls.Add(this.menu);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsMdiContainer = true;
diff --git a/Src/SwqlStudio/SwqlStudio.csproj b/Src/SwqlStudio/SwqlStudio.csproj
index 3d55ae99a..1d675281a 100644
--- a/Src/SwqlStudio/SwqlStudio.csproj
+++ b/Src/SwqlStudio/SwqlStudio.csproj
@@ -20,6 +20,7 @@
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <ApplicationIcon>Main.ico</ApplicationIcon>
     <StartupObject />
+    <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Src/SwqlStudio/app.config b/Src/SwqlStudio/app.config
index a68c0e605..a10553573 100644
--- a/Src/SwqlStudio/app.config
+++ b/Src/SwqlStudio/app.config
@@ -116,6 +116,9 @@
       </setting>
     </SwqlStudio.Properties.Settings>
   </applicationSettings>
+  <System.Windows.Forms.ApplicationConfigurationSection>
+    <add key="DpiAwareness" value="PerMonitorV2" />
+  </System.Windows.Forms.ApplicationConfigurationSection>
   <system.serviceModel>
     <services>
       <service name="SwqlStudio.Subscriptions.NotificationSubscriber" behaviorConfiguration="NotificationSubscriber">
diff --git a/Src/SwqlStudio/app.manifest b/Src/SwqlStudio/app.manifest
new file mode 100644
index 000000000..0deaca88f
--- /dev/null
+++ b/Src/SwqlStudio/app.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+</assembly>