diff --git a/modules/node.views.inc b/modules/node.views.inc
index 71a1023..ff446b4 100644
--- a/modules/node.views.inc
+++ b/modules/node.views.inc
@@ -671,6 +671,7 @@ function node_views_plugins() {
         'uses options' => TRUE,
         'type' => 'normal',
         'help topic' => 'style-node',
+	'theme' => 'node',
       ),
       'node_rss' => array(
         'title' => t('Content'),
diff --git a/modules/node/views_plugin_row_node_view.inc b/modules/node/views_plugin_row_node_view.inc
index 4aefe46..f89a9ae 100644
--- a/modules/node/views_plugin_row_node_view.inc
+++ b/modules/node/views_plugin_row_node_view.inc
@@ -104,6 +104,9 @@ class views_plugin_row_node_view extends views_plugin_row {
       $node->view = $this->view;
       $build = node_view($node, $this->options['view_mode']);
 
+      // Add theme suggestions for the node
+      $build['#theme'] = $this->theme_functions();
+
       return drupal_render($build);
     }
   }