diff --git a/src/main/java/storagecraft/gui/GuiGrid.java b/src/main/java/storagecraft/gui/GuiGrid.java
index 4cd77e05a..fa2938d12 100644
--- a/src/main/java/storagecraft/gui/GuiGrid.java
+++ b/src/main/java/storagecraft/gui/GuiGrid.java
@@ -249,6 +249,24 @@ public class GuiGrid extends GuiBase
 			}
 		}
 
+		items.sort(new Comparator<StorageItem>()
+		{
+			@Override
+			public int compare(StorageItem o1, StorageItem o2)
+			{
+				if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING)
+				{
+					return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName());
+				}
+				else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING)
+				{
+					return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName());
+				}
+
+				return 0;
+			}
+		});
+
 		if (grid.getSortingType() == TileGrid.SORTING_TYPE_QUANTITY)
 		{
 			items.sort(new Comparator<StorageItem>()
@@ -269,26 +287,6 @@ public class GuiGrid extends GuiBase
 				}
 			});
 		}
-		else if (grid.getSortingType() == TileGrid.SORTING_TYPE_NAME)
-		{
-			items.sort(new Comparator<StorageItem>()
-			{
-				@Override
-				public int compare(StorageItem o1, StorageItem o2)
-				{
-					if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING)
-					{
-						return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName());
-					}
-					else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING)
-					{
-						return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName());
-					}
-
-					return 0;
-				}
-			});
-		}
 
 		return items;
 	}
diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java
index c3e69a56e..1f5eb3b54 100644
--- a/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java
+++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java
@@ -31,7 +31,7 @@ public class SideButtonGridSortingType extends SideButton
 	public void draw(GuiBase gui, int x, int y)
 	{
 		gui.bindTexture("icons.png");
-		gui.drawTexture(x, y + 2 - 1, grid.getSortingType() * 16, 32, 16, 16);
+		gui.drawTexture(x - 1, y + 2 - 1, grid.getSortingType() * 16, 32, 16, 16);
 	}
 
 	@Override