diff --git a/admin_menu.module b/admin_menu.module
index 32ed441..6520fdb 100644
--- a/admin_menu.module
+++ b/admin_menu.module
@@ -227,12 +227,6 @@ function admin_menu_page_build(&$page) {
   if ($setting = variable_get('admin_menu_tweak_tabs', 0)) {
     $settings['tweak_tabs'] = $setting;
   }
-  if ($_GET['q'] == 'admin/modules' || strpos($_GET['q'], 'admin/modules/list') === 0) {
-    $settings['tweak_modules'] = variable_get('admin_menu_tweak_modules', 0);
-  }
-  if ($_GET['q'] == 'admin/people/permissions' || $_GET['q'] == 'admin/people/permissions/list') {
-    $settings['tweak_permissions'] = variable_get('admin_menu_tweak_permissions', 0);
-  }
 
   $attached['js'][] = array(
     'data' => array('admin_menu' => $settings),
@@ -777,6 +771,26 @@ function admin_menu_form_alter_flush_cache_submit($form, &$form_state) {
 }
 
 /**
+ * Implements hook_form_FORM_ID_alter() for system_modules().
+ */
+function admin_menu_form_system_modules_alter(&$form, &$form_state) {
+  $form['#attached']['js'][] = array(
+    'data' => array('admin_menu' => array('tweak_modules' => variable_get('admin_menu_tweak_modules', 0))),
+    'type' => 'setting',
+  );
+}
+
+/**
+ * Implements hook_form_FORM_ID_alter() for user_admin_permissions().
+ */
+function admin_menu_form_user_admin_permissions_alter(&$form, &$form_state) {
+  $form['#attached']['js'][] = array(
+    'data' => array('admin_menu' => array('tweak_permissions' => variable_get('admin_menu_tweak_permissions', 0))),
+    'type' => 'setting',
+  );
+}
+
+/**
  * Implements hook_form_FORM_ID_alter().
  *
  * Extends Devel module with Administration menu developer settings.