diff --git a/src/main/java/systems/brn/server_storage/screens/StorageScreen.java b/src/main/java/systems/brn/server_storage/screens/StorageScreen.java
index 526c8f0..bebf213 100644
--- a/src/main/java/systems/brn/server_storage/screens/StorageScreen.java
+++ b/src/main/java/systems/brn/server_storage/screens/StorageScreen.java
@@ -84,7 +84,7 @@ public class StorageScreen extends PagedGui {
         if (clickedElement != null) {
             ItemStack clickedItem = clickedElement.getItemStack();
             ItemStack noLoreStack = removeCountFromLore(clickedItem);
-            if (noLoreStack.getCount() > noLoreStack.getMaxCount()) {
+            if (noLoreStack.getCount() > noLoreStack.getMaxCount() && !type.shift) {
                 noLoreStack.setCount(noLoreStack.getMaxCount());
             }
             int maxToInsert = canInsertItemIntoPlayerInventory(player, noLoreStack);
@@ -141,6 +141,7 @@ public class StorageScreen extends PagedGui {
 
     public void doSearch(String query) {
         this.query = query;
+        this.page = 0;
         this.updateDisplay();
     }
 }