diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index be60e48..6493849 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -1585,7 +1585,13 @@ function template_preprocess_node(&$variables) {
   }
 
   // Clean up name so there are no underscores.
+  if ($variables['view_mode']) {
+    $variables['theme_hook_suggestions'][] = 'node__' . $variables['view_mode'];
+  }
   $variables['theme_hook_suggestions'][] = 'node__' . $node->type;
+  if ($variables['view_mode']) {
+    $variables['theme_hook_suggestions'][] = 'node__' . $node->type . '__' . $variables['view_mode'];
+  }
   $variables['theme_hook_suggestions'][] = 'node__' . $node->nid;
 }