diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index 7c643cf..fe0f1ed 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -1783,7 +1783,7 @@ public function buildOptionsForm(&$form, &$form_state) {
         }
 
         if (isset($GLOBALS['theme']) && $GLOBALS['theme'] == $this->theme) {
-          $this->theme_registry = \Drupal::service('theme.registry')->get();
+          $this->theme_registry = \Drupal::service('theme.registry');
           $theme_engine = $GLOBALS['theme_engine'];
         }
         else {
@@ -1796,7 +1796,7 @@ public function buildOptionsForm(&$form, &$form_state) {
           if (isset($theme->engine)) {
             $theme_engine = $theme->engine;
           }
-          $cache_theme = \Drupal::service('cache.theme');
+          $cache_theme = \Drupal::service('cache.cache');
           $this->theme_registry = new Registry($cache_theme, \Drupal::lock(), \Drupal::moduleHandler(), $theme->name);
         }
 
@@ -2090,7 +2090,7 @@ public function changeThemeForm($form, &$form_state) {
    * Format a list of theme templates for output by the theme info helper.
    */
   protected function formatThemes($themes) {
-    $registry = $this->theme_registry;
+    $registry = $this->theme_registry->get();
     $extension = $this->theme_extension;
 
     $picked = FALSE;
@@ -2098,12 +2098,13 @@ protected function formatThemes($themes) {
       $template = strtr($theme, '_', '-') . $extension;
       if (!$picked && !empty($registry[$theme])) {
         $template_path = isset($registry[$theme]['path']) ? $registry[$theme]['path'] . '/' : './';
-        if (file_exists($template_path . $template)) {
-          $hint = t('File found in folder @template-path', array('@template-path' => $template_path));
+        $template_filepath = $template_path . ($theme != 'views_view_field' ? $registry[$theme]['template'] : 'template') . $extension;
+        if (file_exists($template_filepath) || $theme == 'views_view_field') {
+          $hint = t('File found in folder @template-path', array('@template-path' => dirname($template_filepath)));
           $template = '<strong title="'. $hint .'">' . $template . '</strong>';
         }
         else {
-          $template = '<strong class="error">' . $template . ' ' . t('(File not found, in folder @template-path)', array('@template-path' => $template_path)) . '</strong>';
+          $template = '<strong class="error">' . $template . ' ' . t('(File not found, in folder @template-path)', array('@template-path' => dirname($template_filepath))) . '</strong>';
         }
         $picked = TRUE;
       }