diff --git a/collects/framework/private/main.ss b/collects/framework/private/main.ss
index 3d58fc73..b4ed1da5 100644
--- a/collects/framework/private/main.ss
+++ b/collects/framework/private/main.ss
@@ -52,9 +52,9 @@
                            boolean?)
   (color-prefs:set-default/color-scheme 'framework:basic-canvas-background "white" "black")
   
-  (preferences:set-default 'framework:special-option-key #f boolean?)
-  (preferences:add-callback 'framework:special-option-key (λ (p v) (special-option-key v)))
-  (special-option-key (preferences:get 'framework:special-option-key))
+  (preferences:set-default 'framework:special-meta-key #f boolean?)
+  (preferences:add-callback 'framework:special-meta-key (λ (p v) (map-command-as-meta-key v)))
+  (map-command-as-meta-key (preferences:get 'framework:special-meta-key))
   
   (preferences:set-default 'framework:fraction-snip-style 'mixed (λ (x) (memq x '(mixed improper))))
   
diff --git a/collects/framework/private/preferences.ss b/collects/framework/private/preferences.ss
index e51e1ceb..1ec5b303 100644
--- a/collects/framework/private/preferences.ss
+++ b/collects/framework/private/preferences.ss
@@ -383,19 +383,21 @@ the state transitions / contracts are:
                                'framework:open-here?
                                (string-constant reuse-existing-frames)
                                values values)
+                   
                    (make-check editor-panel 
                                'framework:menu-bindings
                                (string-constant enable-keybindings-in-menus)
                                values values)
+                   (when (memq (system-type) '(macosx))
+                     (make-check editor-panel 
+                                 'framework:special-meta-key
+                                 (string-constant command-as-meta)
+                                 values values))
+                   
                    (make-check editor-panel 
                                'framework:coloring-active
                                (string-constant online-coloring-active)
                                values values)
-                   (when (memq (system-type) '(macos macosx))
-                     (make-check editor-panel 
-                                 'framework:special-option-key
-                                 (string-constant option-as-meta)
-                                 values values))
                    (unless (eq? (system-type) 'unix) 
                      (make-check editor-panel 
                                  'framework:print-output-mode