diff --git a/includes/message.admin.inc b/includes/message.admin.inc
index c7ae1d0..380d4bd 100644
--- a/includes/message.admin.inc
+++ b/includes/message.admin.inc
@@ -316,6 +316,7 @@ function message_type_form($form, &$form_state, $message_type, $op = 'edit') {
   if (module_exists('token')) {
     $form['token_tree'] = array(
       '#theme' => 'token_tree',
+      '#dialog' => TRUE,
       '#token_types' => $token_types + array('all'),
     );