diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c69f20e6..ca7a7daba 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Fixed
 
 -   Fixed not being able to close GUIs anymore with autoselected search box mode.
+-   Fixed lingering tooltips of side buttons.
 
 ## [1.12.1] - 2023-07-03
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java
index 467e82840..4e56679ba 100644
--- a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java
+++ b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java
@@ -155,12 +155,6 @@ public abstract class BaseScreen<T extends AbstractContainerMenu> extends Abstra
 
         renderForeground(graphics, mouseX, mouseY);
 
-        for (Renderable renderable : this.renderables) {
-            if (renderable instanceof SideButton sideButton) {
-                sideButton.renderTooltip(graphics, mouseX, mouseY);
-            }
-        }
-
         for (int i = 0; i < this.menu.slots.size(); ++i) {
             Slot slot = menu.slots.get(i);
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java
index f93a0dc82..e7da276e0 100644
--- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java
+++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java
@@ -22,15 +22,6 @@ public abstract class SideButton extends Button {
         this.screen = screen;
     }
 
-    public void renderTooltip(GuiGraphics graphics, int mouseX, int mouseY) {
-        boolean isFocused = isFocused();
-        if (isHovered || isFocused) {
-            int x = isHovered ? mouseX : (this.getX() - screen.getGuiLeft()) + width;
-            int y = isHovered ? mouseY : (this.getY() - screen.getGuiTop()) + (height / 2);
-            screen.renderTooltip(graphics, x, y, getSideButtonTooltip());
-        }
-    }
-
     @Override
     public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
@@ -41,12 +32,14 @@ public abstract class SideButton extends Button {
 
         renderButtonIcon(graphics, getX() + 1, getY() + 1);
 
-        if (isHoveredOrFocused()) {
+        if (isHovered) {
             RenderSystem.enableBlend();
             RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
             RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 0.5f);
             graphics.blit(BaseScreen.ICONS_TEXTURE, getX(), getY(), 238, 54, WIDTH, HEIGHT);
+            RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
             RenderSystem.disableBlend();
+            screen.renderTooltip(graphics, mouseX, mouseY, getSideButtonTooltip());
         }
     }