diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss
index 0ba30ed867..de283d13ff 100644
--- a/collects/mred/mred.ss
+++ b/collects/mred/mred.ss
@@ -74,6 +74,11 @@
         (namespace-require 'scheme/class))
       ns))
 
+  (define (make-eventspace)
+    (parameterize ([wx:the-snip-class-list (wx:make-the-snip-class-list)]
+                   [wx:the-editor-data-class-list (wx:make-the-editor-data-class-list)])
+      (wx:make-eventspace)))
+
   ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
   (define-syntax propagate
@@ -139,7 +144,6 @@
 	     is-color-display?
 	     key-event%
 	     keymap%
-	     make-eventspace
 	     editor-admin%
 	     editor-set-x-selection-mode
 	     editor-snip-editor-admin<%>
@@ -307,6 +311,7 @@
 	   current-eventspace-has-standard-menus?
 	   current-eventspace-has-menu-root?
 	   eventspace-handler-thread
+           make-eventspace
 	   make-gui-namespace
 	   make-gui-empty-namespace
 	   file-creator-and-type
diff --git a/collects/mred/private/wxme/snip.ss b/collects/mred/private/wxme/snip.ss
index 6b2da06896..22b4c0daf5 100644
--- a/collects/mred/private/wxme/snip.ss
+++ b/collects/mred/private/wxme/snip.ss
@@ -26,6 +26,11 @@
          get-the-snip-class-list
          get-the-editor-data-class-list
          the-editor-snip-class
+
+         the-snip-class-list ;; parameter
+         make-the-snip-class-list
+         the-editor-data-class-list ;; parameter
+         make-the-editor-data-class-list
          
          (struct-out snip-class-link)
          (struct-out editor-data-class-link)
@@ -1321,9 +1326,10 @@
 (define (make-the-snip-class-list)
   (new standard-snip-class-list%))
 
-(define the-snip-class-list (make-the-snip-class-list))
+(define the-snip-class-list (make-parameter (make-the-snip-class-list)))
+
 (define (get-the-snip-class-list)
-  the-snip-class-list)
+  (the-snip-class-list))
 
 ;; ------------------------------------------------------------
 
@@ -1463,9 +1469,9 @@
 (define (make-the-editor-data-class-list)
   (new editor-data-class-list%))
 
-(define the-editor-data-class-list (make-the-editor-data-class-list))
+(define the-editor-data-class-list (make-parameter (make-the-editor-data-class-list)))
 (define (get-the-editor-data-class-list)
-  the-editor-data-class-list)
+  (the-editor-data-class-list))
 
 ;; ------------------------------------------------------------