diff --git a/ContextMenuManager/BluePointLilac.Methods/UAWebClient.cs b/ContextMenuManager/BluePointLilac.Methods/UAWebClient.cs
index 5b50745..7c83c4a 100644
--- a/ContextMenuManager/BluePointLilac.Methods/UAWebClient.cs
+++ b/ContextMenuManager/BluePointLilac.Methods/UAWebClient.cs
@@ -1,5 +1,5 @@
-using System.Text;
-using System.Net;
+using System.Net;
+using System.Text;
 
 namespace BluePointLilac.Methods
 {
diff --git a/ContextMenuManager/ContextMenuManager.csproj b/ContextMenuManager/ContextMenuManager.csproj
index fd44ee4..2d3e068 100644
--- a/ContextMenuManager/ContextMenuManager.csproj
+++ b/ContextMenuManager/ContextMenuManager.csproj
@@ -34,7 +34,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>true</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
diff --git a/ContextMenuManager/Controls/Interfaces/IBtnDeleteItem.cs b/ContextMenuManager/Controls/Interfaces/IBtnDeleteItem.cs
index e144a8c..9ab8588 100644
--- a/ContextMenuManager/Controls/Interfaces/IBtnDeleteItem.cs
+++ b/ContextMenuManager/Controls/Interfaces/IBtnDeleteItem.cs
@@ -23,8 +23,9 @@ namespace ContextMenuManager.Controls.Interfaces
                 {
                     MyList list = (MyList)listItem.Parent;
                     int index = list.GetItemIndex(listItem);
+                    index -= (index < list.Controls.Count) ? 0 : 1;
                     item.DeleteMe();
-                    list.HoveredItem = (MyListItem)list.Controls[index - 1];
+                    list.HoveredItem = (MyListItem)list.Controls[index];
                 }
             };
         }
diff --git a/ContextMenuManager/Controls/Interfaces/ITsiDeleteItem.cs b/ContextMenuManager/Controls/Interfaces/ITsiDeleteItem.cs
index 676c0ec..9ad2107 100644
--- a/ContextMenuManager/Controls/Interfaces/ITsiDeleteItem.cs
+++ b/ContextMenuManager/Controls/Interfaces/ITsiDeleteItem.cs
@@ -40,8 +40,9 @@ namespace ContextMenuManager.Controls.Interfaces
                 MyListItem listItem = (MyListItem)item;
                 MyList list = (MyList)listItem.Parent;
                 int index = list.GetItemIndex(listItem);
+                index -= (index < list.Controls.Count) ? 0 : 1;
                 item.DeleteMe();
-                list.HoveredItem = (MyListItem)list.Controls[index - 1];
+                list.HoveredItem = (MyListItem)list.Controls[index];
             };
         }
     }