diff --git a/Business/WaitToLoadMenu.cs b/Business/WaitToLoadMenu.cs
index 7f59dd2..70dc82d 100644
--- a/Business/WaitToLoadMenu.cs
+++ b/Business/WaitToLoadMenu.cs
@@ -52,12 +52,15 @@ namespace SystemTrayMenu.Handler
             if (MouseActive)
             {
                 DataGridView dgv = (DataGridView)sender;
-                MouseEnterOk(dgv, e.RowIndex);
-                timerStartLoad.Stop();
-                StopLoadMenu?.Invoke();
-                checkForMouseActive = true;
-                SetData(dgv, e.RowIndex);
-                timerStartLoad.Start();
+                if (dgv.Rows.Count > e.RowIndex)
+                {
+                    MouseEnterOk(dgv, e.RowIndex);
+                    timerStartLoad.Stop();
+                    StopLoadMenu?.Invoke();
+                    checkForMouseActive = true;
+                    SetData(dgv, e.RowIndex);
+                    timerStartLoad.Start();
+                }
             }
             else
             {
@@ -68,12 +71,15 @@ namespace SystemTrayMenu.Handler
 
         internal void RowSelected(DataGridView dgv, int rowIndex)
         {
-            timerStartLoad.Stop();
-            StopLoadMenu?.Invoke();
-            SetData(dgv, rowIndex);
-            MouseActive = false;
-            checkForMouseActive = false;
-            timerStartLoad.Start();
+            if (dgv.Rows.Count > rowIndex)
+            {
+                timerStartLoad.Stop();
+                StopLoadMenu?.Invoke();
+                SetData(dgv, rowIndex);
+                MouseActive = false;
+                checkForMouseActive = false;
+                timerStartLoad.Start();
+            }
         }
 
         internal void MouseLeave(object sender, DataGridViewCellEventArgs e)
diff --git a/Packaging/Package.appxmanifest b/Packaging/Package.appxmanifest
index 10976f1..d1a2096 100644
--- a/Packaging/Package.appxmanifest
+++ b/Packaging/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="49543SystemTrayMenu.SystemTrayMenu"
     Publisher="CN=5884501C-92ED-45DE-9508-9D987C314243"
-    Version="1.0.14.0" />
+    Version="1.0.15.0" />
 
   <Properties>
     <DisplayName>SystemTrayMenu</DisplayName>
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 947db1f..df924a7 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -39,5 +39,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.15.0")]
-[assembly: AssemblyFileVersion("1.0.15.0")]
+[assembly: AssemblyVersion("1.0.15.1")]
+[assembly: AssemblyFileVersion("1.0.15.1")]