diff --git a/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php b/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
index fb0538a..4a7a566 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
@@ -467,6 +467,7 @@ public function searchFormSubmit(array &$form, array &$form_state) {
     // Initialize using any existing basic search keywords.
     $keys = $form_state['values']['processed_keys'];
     $filters = array();
+    $has_conditions = ($keys != '');
 
     // Collect extra restrictions.
     if (isset($form_state['values']['type']) && is_array($form_state['values']['type'])) {
@@ -475,6 +476,7 @@ public function searchFormSubmit(array &$form, array &$form_state) {
       foreach ($form_state['values']['type'] as $type) {
         if ($type) {
           $filters[] = 'type:' . $type;
+          $has_conditions = TRUE;
         }
       }
     }
@@ -482,31 +484,40 @@ public function searchFormSubmit(array &$form, array &$form_state) {
     if (isset($form_state['values']['term']) && is_array($form_state['values']['term'])) {
       foreach ($form_state['values']['term'] as $term) {
         $filters[] = 'term:' . $term;
+        $has_conditions = TRUE;
       }
     }
     if (isset($form_state['values']['language']) && is_array($form_state['values']['language'])) {
       foreach ($form_state['values']['language'] as $language) {
         if ($language) {
           $filters[] = 'language:' . $language;
+          $has_conditions = TRUE;
         }
       }
     }
     if ($form_state['values']['or'] != '') {
       if (preg_match_all('/ ("[^"]+"|[^" ]+)/i', ' ' . $form_state['values']['or'], $matches)) {
         $keys .= ' ' . implode(' OR ', $matches[1]);
+        $has_conditions = TRUE;
       }
     }
     if ($form_state['values']['negative'] != '') {
       if (preg_match_all('/ ("[^"]+"|[^" ]+)/i', ' ' . $form_state['values']['negative'], $matches)) {
         $keys .= ' -' . implode(' -', $matches[1]);
+        $has_conditions = TRUE;
       }
     }
     if ($form_state['values']['phrase'] != '') {
       $keys .= ' "' . str_replace('"', ' ', $form_state['values']['phrase']) . '"';
+      $has_conditions = TRUE;
     }
     if (!empty($keys)) {
       form_set_value($form['basic']['processed_keys'], trim($keys), $form_state);
     }
+    if (!$has_conditions) {
+      form_set_error('keys', $form_state, $this->t('Please enter some keywords.'));
+    }
+
     $options = array();
     if ($filters) {
       $options['query'] = array('f' => $filters);
