diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8576faa41..107c1f67f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Fixed OpenComputers voiding items with extract item API when there is no inventory space (raoulvdberge)
 - Fixed CraftingTweaks buttons resetting sometimes in the Crafting Grid (raoulvdberge)
 - Fixed Refined Storage jars not being signed (raoulvdberge)
+- Fixed client stalling when trying to search with # for tooltips (raoulvdberge)
 - Removed getMissingItems() and getMissingFluids() functions from the OpenComputers integration, that info is now accessible through schedule(Fluid)Task(). If you just want to check if there are missing items/fluids but don't want to start an actual task, use the "canSchedule" parameter (raoulvdberge)
 - Updated Russian translation (kellixon)
 - Added fluid functions for the fluid autocrafting to the OpenComputers integration (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java
index 6807ba654..8a78c4968 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java
@@ -28,6 +28,7 @@ public class GridStackItem implements IGridStack {
     private IStorageTracker.IStorageTrackerEntry entry;
     private String modId;
     private String modName;
+    private String tooltip;
 
     public GridStackItem(ItemStack stack) {
         this.stack = stack;
@@ -137,11 +138,15 @@ public class GridStackItem implements IGridStack {
 
     @Override
     public String getTooltip() {
-        try {
-            return RenderUtils.getItemTooltip(stack).stream().collect(Collectors.joining("\n"));
-        } catch (Throwable t) {
-            return "";
+        if (tooltip == null) {
+            try {
+                tooltip = RenderUtils.getItemTooltip(stack).stream().collect(Collectors.joining("\n"));
+            } catch (Throwable t) {
+                tooltip = "";
+            }
         }
+
+        return tooltip;
     }
 
     @Override