diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index 1ae8e5bef..6cbd4fe54 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -200,7 +200,7 @@ Index =
 
   menu:
     init: ->
-      return if g.VIEW isnt 'index' or !Conf['JSON Index'] or !Conf['Menu'] or !Conf['Thread Hiding Link'] or g.BOARD.ID is 'f'
+      return unless g.VIEW is 'index' and Conf['Menu'] and Conf['Thread Hiding Link'] and Index.enabledOn(g.BOARD)
 
       Menu.menu.addEntry
         el: $.el 'a',
diff --git a/src/site/SW.tinyboard.coffee b/src/site/SW.tinyboard.coffee
index 2ef79e827..3fa22b003 100644
--- a/src/site/SW.tinyboard.coffee
+++ b/src/site/SW.tinyboard.coffee
@@ -8,7 +8,6 @@ SW.tinyboard =
     'Quick Reply Personas'
     'Quick Reply'
     'Cooldown'
-    'Index Generator (Menu)'
     'Report Link'
     'Delete Link'
     'Edit Link'