diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 9138f26..79c1a97 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.2.6.5")]
-[assembly: AssemblyFileVersion("1.2.6.5")]
+[assembly: AssemblyVersion("1.2.7.0")]
+[assembly: AssemblyFileVersion("1.2.7.0")]
diff --git a/UserInterface/Menu.cs b/UserInterface/Menu.cs
index 80d9a61..01efffe 100644
--- a/UserInterface/Menu.cs
+++ b/UserInterface/Menu.cs
@@ -886,7 +886,7 @@ namespace SystemTrayMenu.UserInterface
                 timerUpdateIcons.Start();
             }
 
-            if (isSearchStringEmpty)
+            if (isSearchStringEmpty && dgv.Rows.Count > 0)
             {
                 dgv.FirstDisplayedScrollingRowIndex = 0;
             }