diff --git a/OverlayPlugin.Common/Properties/AssemblyInfo.cs b/OverlayPlugin.Common/Properties/AssemblyInfo.cs
index 8716ce9b..179307a3 100644
--- a/OverlayPlugin.Common/Properties/AssemblyInfo.cs
+++ b/OverlayPlugin.Common/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.3.6")]
\ No newline at end of file
+[assembly: AssemblyVersion("0.3.3.7")]
\ No newline at end of file
diff --git a/OverlayPlugin.Core/OverlayBase.cs b/OverlayPlugin.Core/OverlayBase.cs
index 9ce0843c..74a5fcff 100644
--- a/OverlayPlugin.Core/OverlayBase.cs
+++ b/OverlayPlugin.Core/OverlayBase.cs
@@ -236,10 +236,15 @@ protected virtual void InitializeTimer()
                     {
                         uint pid;
                         var hWndFg = NativeMethods.GetForegroundWindow();
+                        if (hWndFg == IntPtr.Zero)
+                        {
+                            return;
+                        }
                         NativeMethods.GetWindowThreadProcessId(hWndFg, out pid);
                         var exePath = Process.GetProcessById((int)pid).MainModule.FileName;
 
                         if (Path.GetFileName(exePath.ToString()) == "ffxiv.exe" ||
+                            Path.GetFileName(exePath.ToString()) == "ffxiv_dx11.exe" ||
                             exePath.ToString() == Process.GetCurrentProcess().MainModule.FileName)
                         {
                             this.Overlay.Visible = true;
diff --git a/OverlayPlugin.Core/Properties/AssemblyInfo.cs b/OverlayPlugin.Core/Properties/AssemblyInfo.cs
index b77116c9..ec57b112 100644
--- a/OverlayPlugin.Core/Properties/AssemblyInfo.cs
+++ b/OverlayPlugin.Core/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.3.6")]
+[assembly: AssemblyVersion("0.3.3.7")]
diff --git a/OverlayPlugin/Properties/AssemblyInfo.cs b/OverlayPlugin/Properties/AssemblyInfo.cs
index c74735de..910d74c2 100644
--- a/OverlayPlugin/Properties/AssemblyInfo.cs
+++ b/OverlayPlugin/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.3.6")]
+[assembly: AssemblyVersion("0.3.3.7")]