Index: gridder.module
===================================================================
--- gridder.module
+++ gridder.module
@@ -25,37 +25,42 @@
  * Implementation of hook_init().
  */
 function gridder_init() {
-  if ((user_access('use 960 gridder') && drupal_substr($_GET['q'], 0, 5) != 'admin') || (variable_get('gridder_admin_enable', false) && drupal_substr($_GET['q'], 0, 5) == 'admin')) {
-  	global $base_url;
-  	$path = drupal_get_path('module', 'gridder');
-  	$gridder_js = "
-  	var module_path = '" .$base_url ."/". $path ."';
-	  gOverride = {
-	    gColor: '".variable_get('gridder_vertical_color', '#EEEEEE')."',
-		  gColumns: " .variable_get('gridder_columns', 12). ",
-		  gOpacity: ".variable_get('gridder_vertical_opacity', 0.35).",
-		  gWidth: ".variable_get('gridder_vertical_gutter_width', 10).",
-		  pColor: '".variable_get('gridder_horizontal_color', '#C0C0C0')."',
-		  pHeight: ".variable_get('gridder_horizontal_lineheight', 15).",
-		  invert: " .variable_get('gridder_vertical_inverted', false). ",
-		  pOffset: ".variable_get('gridder_horizontal_offset', 0).",
-		  pOpacity: ".variable_get('gridder_horizontal_opacity', 0.55).",
-		  center: " .variable_get('gridder_vertical_centered', true). ",
-		  gEnabled: " .variable_get('gridder_vertical_enabled', true). ",
-		  pEnabled: " .variable_get('gridder_horizontal_enabled', false). ",
-		  setupEnabled: true,
-		  fixFlash: true,
-		  size: 960
-	  }
+  if ( !user_access('use 960 gridder')
+   || ( !variable_get('gridder_admin_enable', false)      // disabled on admin pages
+     && ( arg(0) == 'admin' || (variable_get('node_admin_theme', '0') && arg(0) == 'node' && (arg(1) == 'add' || arg(2) == 'edit')) )
+     ) )  {
+   return;    // no gridder
+  }
 
-	  Drupal.behaviors.createGridder = function() {
-	    document.body.appendChild(
-	      document.createElement('script'))
-	        .src='".$base_url ."/". $path . "/gridder.js';
-	  };";
-    drupal_add_js($gridder_js, 'inline');
-    drupal_add_css($path .'/gridder.css', 'module', 'all', FALSE);
+  global $base_url;
+  $path = drupal_get_path('module', 'gridder');
+  $gridder_js = "
+  var module_path = '" .$base_url ."/". $path ."';
+  gOverride = {
+    gColor: '".variable_get('gridder_vertical_color', '#EEEEEE')."',
+    gColumns: " .variable_get('gridder_columns', 12). ",
+    gOpacity: ".variable_get('gridder_vertical_opacity', 0.35).",
+    gWidth: ".variable_get('gridder_vertical_gutter_width', 10).",
+    pColor: '".variable_get('gridder_horizontal_color', '#C0C0C0')."',
+    pHeight: ".variable_get('gridder_horizontal_lineheight', 15).",
+    invert: " .variable_get('gridder_vertical_inverted', false). ",
+    pOffset: ".variable_get('gridder_horizontal_offset', 0).",
+    pOpacity: ".variable_get('gridder_horizontal_opacity', 0.55).",
+    center: " .variable_get('gridder_vertical_centered', true). ",
+    gEnabled: " .variable_get('gridder_vertical_enabled', true). ",
+    pEnabled: " .variable_get('gridder_horizontal_enabled', false). ",
+    setupEnabled: true,
+    fixFlash: true,
+    size: 960
   }
+
+  Drupal.behaviors.createGridder = function() {
+    document.body.appendChild(
+      document.createElement('script'))
+        .src='".$base_url ."/". $path . "/gridder.js';
+  };";
+  drupal_add_js($gridder_js, 'inline');
+  drupal_add_css($path .'/gridder.css', 'module', 'all', FALSE);
 }
 /*
  * Admin Settings form for Save & Edit