diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java
index f11efdf84..94ab4aefc 100644
--- a/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java
+++ b/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java
@@ -102,7 +102,7 @@ public class CraftingMonitorScreen extends BaseScreen<CraftingMonitorContainer>
     private final ICraftingMonitor craftingMonitor;
 
     private List<IGridTab> tasks = Collections.emptyList();
-    private final TabListWidget tabs;
+    private final TabListWidget<CraftingMonitorContainer> tabs;
 
     private final IElementDrawers drawers = new CraftingMonitorElementDrawers(this, ITEM_WIDTH, ITEM_HEIGHT);
 
@@ -111,7 +111,7 @@ public class CraftingMonitorScreen extends BaseScreen<CraftingMonitorContainer>
 
         this.craftingMonitor = container.getCraftingMonitor();
 
-        this.tabs = new TabListWidget(this, new ElementDrawers<>(this), () -> tasks, () -> (int) Math.floor((float) Math.max(0, tasks.size() - 1) / (float) ICraftingMonitor.TABS_PER_PAGE), craftingMonitor::getTabPage, () -> {
+        this.tabs = new TabListWidget<>(this, new ElementDrawers<>(this), () -> tasks, () -> (int) Math.floor((float) Math.max(0, tasks.size() - 1) / (float) ICraftingMonitor.TABS_PER_PAGE), craftingMonitor::getTabPage, () -> {
             IGridTab tab = getCurrentTab();
 
             if (tab == null) {
diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java
index 3383508b2..fcb2152ac 100644
--- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java
+++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java
@@ -59,7 +59,7 @@ public class GridScreen extends BaseScreen<GridContainer> implements IScreenInfo
     private ScrollbarWidget scrollbar;
 
     private final IGrid grid;
-    private final TabListWidget tabs;
+    private final TabListWidget<GridContainer> tabs;
 
     private boolean wasConnected;
     private boolean doSort;
@@ -72,7 +72,7 @@ public class GridScreen extends BaseScreen<GridContainer> implements IScreenInfo
         this.grid = grid;
         this.view = grid.getGridType() == GridType.FLUID ? new FluidGridView(this, getDefaultSorter(), getSorters()) : new ItemGridView(this, getDefaultSorter(), getSorters());
         this.wasConnected = this.grid.isGridActive();
-        this.tabs = new TabListWidget(this, new ElementDrawers<>(this), grid::getTabs, grid::getTotalTabPages, grid::getTabPage, grid::getTabSelected, IGrid.TABS_PER_PAGE);
+        this.tabs = new TabListWidget<>(this, new ElementDrawers<>(this), grid::getTabs, grid::getTotalTabPages, grid::getTabPage, grid::getTabSelected, IGrid.TABS_PER_PAGE);
         this.tabs.addListener(new TabListWidget.ITabListListener() {
             @Override
             public void onSelectionChanged(int tab) {
diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java
index 1fcd5ed02..8c29c5706 100644
--- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java
+++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java
@@ -9,13 +9,14 @@ import com.refinedmods.refinedstorage.screen.BaseScreen;
 import com.refinedmods.refinedstorage.util.RenderUtils;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.widget.button.Button;
+import net.minecraft.inventory.container.Container;
 import net.minecraft.util.text.StringTextComponent;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.function.Supplier;
 
-public class TabListWidget {
+public class TabListWidget<T extends Container> {
     public interface ITabListListener {
         void onSelectionChanged(int tab);
 
@@ -23,7 +24,7 @@ public class TabListWidget {
     }
 
     private final BaseScreen<?> screen;
-    private final ElementDrawers drawers;
+    private final ElementDrawers<T> drawers;
 
     private final Supplier<List<IGridTab>> tabs;
     private int tabHovering;
@@ -38,7 +39,7 @@ public class TabListWidget {
     private Button left;
     private Button right;
 
-    public TabListWidget(BaseScreen<?> screen, ElementDrawers drawers, Supplier<List<IGridTab>> tabs, Supplier<Integer> pages, Supplier<Integer> page, Supplier<Integer> selected, int tabsPerPage) {
+    public TabListWidget(BaseScreen<T> screen, ElementDrawers<T> drawers, Supplier<List<IGridTab>> tabs, Supplier<Integer> pages, Supplier<Integer> page, Supplier<Integer> selected, int tabsPerPage) {
         this.screen = screen;
         this.drawers = drawers;
         this.tabs = tabs;