diff --git a/CHANGELOG.md b/CHANGELOG.md
index 295ac0f7c..f1a7d546c 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Fixed network node scanning allowing multiple controllers in some cases (raoulvdberge)
 - Fixed OpenComputers integration not giving back a crafting task instance in the schedule task API (raoulvdberge)
 - Fixed OpenComputers integration causing log spam when getting processing patterns (raoulvdberge)
+- Fixed CraftingTweaks buttons resetting sometimes in the Crafting Grid (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)
 - Added fluid functions for the fluid autocrafting to the OpenComputers integration (raoulvdberge)
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java
index acf754c18..9dbde8cb2 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java
@@ -133,7 +133,9 @@ public abstract class GuiBase extends GuiContainer {
 
         super.initGui();
 
-        buttonList.clear();
+        if (!buttonList.isEmpty()) {
+            buttonList.removeIf(b -> !b.getClass().getName().contains("net.blay09.mods.craftingtweaks")); // Prevent crafting tweaks buttons from resetting
+        }
 
         lastButtonId = 0;
         lastSideButtonY = getSideButtonYStart();
@@ -152,6 +154,7 @@ public abstract class GuiBase extends GuiContainer {
     }
 
     protected void calcHeight() {
+        // NO OP
     }
 
     protected int getSideButtonYStart() {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafterManager.java
index 86d628fbb..1a27105ee 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafterManager.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafterManager.java
@@ -41,8 +41,6 @@ public class GuiCrafterManager extends GuiBase implements IResizableDisplay {
 
     @Override
     protected void calcHeight() {
-        super.calcHeight();
-
         this.ySize = getTopHeight() + getBottomHeight() + (getVisibleRows() * 18);
         this.screenHeight = ySize;
     }