diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 9e9529e..e7d5131 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -266,7 +266,7 @@ function views_preprocess_comment(&$variables) {
  */
 function views_theme_suggestions_comment_alter(array &$suggestions, array $variables) {
   $comment = $variables['elements']['#comment'];
-  if (!empty($comment->view) && $comment->view->storage->id()) {
+ if (!empty($variables['element']['#type']) && $variables['element']['#type'] == 'more_link' && !empty($variables['element']['#view']) && $variables['element']['#view'] instanceof \Drupal\views\ViewExecutable) {
     $suggestions[] = 'comment__view__' . $comment->view->storage->id();
     if (!empty($comment->view->current_display)) {
       $suggestions[] = 'comment__view__' . $comment->view->storage->id() . '__' . $comment->view->current_display;