diff --git a/src/main/java/me/rigamortis/seppuku/impl/gui/hud/component/HubComponent.java b/src/main/java/me/rigamortis/seppuku/impl/gui/hud/component/HubComponent.java
index b2b4a25..da0d0e6 100644
--- a/src/main/java/me/rigamortis/seppuku/impl/gui/hud/component/HubComponent.java
+++ b/src/main/java/me/rigamortis/seppuku/impl/gui/hud/component/HubComponent.java
@@ -87,7 +87,7 @@ public final class HubComponent extends DraggableHudComponent {
 
         final boolean inside = mouseX >= this.getX() && mouseX <= this.getX() + this.getW() && mouseY >= this.getY() && mouseY <= this.getY() + this.getH();
         if (inside && button == 0) {
-            int offsetY = 0;
+            int offsetY = BORDER;
             for (HudComponent component : Seppuku.INSTANCE.getHudManager().getComponentList()) {
                 if (component != this) {
                     final boolean insideTitlebar = mouseY <= this.getY() + BORDER + Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT + 1;
diff --git a/src/main/java/me/rigamortis/seppuku/impl/gui/hud/component/module/ModuleListComponent.java b/src/main/java/me/rigamortis/seppuku/impl/gui/hud/component/module/ModuleListComponent.java
index 3b4b65d..6be1ee0 100644
--- a/src/main/java/me/rigamortis/seppuku/impl/gui/hud/component/module/ModuleListComponent.java
+++ b/src/main/java/me/rigamortis/seppuku/impl/gui/hud/component/module/ModuleListComponent.java
@@ -88,7 +88,7 @@ public final class ModuleListComponent extends DraggableHudComponent {
 
         final boolean inside = mouseX >= this.getX() && mouseX <= this.getX() + this.getW() && mouseY >= this.getY() && mouseY <= this.getY() + this.getH();
         if (inside && button == 0) {
-            int offsetY = 0;
+            int offsetY = BORDER;
             for (Module module : Seppuku.INSTANCE.getModuleManager().getModuleList(this.type)) {
                 final boolean insideTitlebar = mouseY <= this.getY() + BORDER + Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT + 1;
                 final boolean insideComponent = mouseX >= (this.getX() + BORDER) && mouseX <= (this.getX() + this.getW() - BORDER - SCROLL_WIDTH) && mouseY >= (this.getY() + BORDER + Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT + 1 + offsetY - this.scroll) && mouseY <= (this.getY() + BORDER + (Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT * 2) + 1 + offsetY - this.scroll);