diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe
index 02381409..166f2061 100644
Binary files a/Bin/net40/SunnyUI.Demo.exe and b/Bin/net40/SunnyUI.Demo.exe differ
diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll
index c509c91b..c27491c9 100644
Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ
diff --git a/SunnyUI/Controls/UIDataGridView.cs b/SunnyUI/Controls/UIDataGridView.cs
index ec141172..199bfd5f 100644
--- a/SunnyUI/Controls/UIDataGridView.cs
+++ b/SunnyUI/Controls/UIDataGridView.cs
@@ -600,10 +600,7 @@ namespace Sunny.UI
         {
             get
             {
-                if (SelectedRows.Count > 0)
-                    return SelectedRows[0].Index;
-                else
-                    return -1;
+                return CurrentRow != null ? CurrentRow.Index : -1;
             }
             set
             {