diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a3772b54a7920ce80f4585b67294692df4cde615..9050595251ed573504e4a012096211291a387397 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,9 @@
 CHANGELOG for Views 2 for Drupal 6
 
 Views 2.x
+  Bugs fixed:
+    o #419226 by kelvincool: Respect admin theme during views ajax operations.
+
   Other changes:
     o #298616: Add argument for node updated time similar to node created time.
     o #325607 by bangpound: Automatically sort exports from bulk export.
diff --git a/includes/ajax.inc b/includes/ajax.inc
index 75ffdbed21691b8630a020b38a7f6a37819455c9..2193c76ce0af8c43fcaf685a4035b5039f6610b9 100644
--- a/includes/ajax.inc
+++ b/includes/ajax.inc
@@ -27,6 +27,13 @@ function views_ajax() {
     $object->status = FALSE;
     $object->display = '';
 
+    $arg = explode('/', $_REQUEST['view_path']);
+    
+    if ($arg[0] == 'admin' || (variable_get('node_admin_theme', '0') && $arg[0] == 'node' && ($arg[1] == 'add' || $arg[2] == 'edit'))) {
+        global $custom_theme;
+        $custom_theme = variable_get('admin_theme', '0');
+        drupal_add_css(drupal_get_path('module', 'system') .'/admin.css', 'module');
+    }
     // Load the view.
     if ($view = views_get_view($name)) {
       if ($view->access($display_id)) {