diff --git a/modules/views/src/Plugin/views/display/EntityReference.php b/modules/views/src/Plugin/views/display/EntityReference.php
index 22c8c8c..201b6cf 100644
--- a/modules/views/src/Plugin/views/display/EntityReference.php
+++ b/modules/views/src/Plugin/views/display/EntityReference.php
@@ -122,9 +122,21 @@ class EntityReference extends DisplayPluginBase {
     // Restrict the autocomplete options based on what's been typed already.
     if (isset($options['match'])) {
       $style_options = $this->getOption('style');
-      $value = db_like($options['match']) . '%';
-      if ($options['match_operator'] != 'STARTS_WITH') {
-        $value = '%' . $value;
+      $value = db_like($options['match']);
+      switch ($options['match_operator']) {
+        case '=':
+          break;
+
+        case 'STARTS_WITH':
+          $value = $value . '%';
+          break;
+
+        case 'ENDS_WITH':
+          $value = '%' . $value;
+          break;
+
+        case 'CONTAINS':
+          $value = '%' . $value . '%';
       }
 
       // Multiple search fields are OR'd together.
diff --git a/modules/views/src/Tests/Plugin/DisplayEntityReferenceTest.php b/modules/views/src/Tests/Plugin/DisplayEntityReferenceTest.php
index 67d4d45..5595164 100644
--- a/modules/views/src/Tests/Plugin/DisplayEntityReferenceTest.php
+++ b/modules/views/src/Tests/Plugin/DisplayEntityReferenceTest.php
@@ -103,6 +103,16 @@ class DisplayEntityReferenceTest extends PluginTestBase {
         $this->fieldName => 'text' . $i,
       ])->save();
     }
+    EntityTest::create([
+      'bundle' => 'entity_test',
+      'name' => 'name',
+      $this->fieldName => 'tex',
+    ])->save();
+    EntityTest::create([
+      'bundle' => 'entity_test',
+      'name' => 'name',
+      $this->fieldName => 'ext',
+    ])->save();
   }
 
   /**
@@ -140,6 +150,62 @@ class DisplayEntityReferenceTest extends PluginTestBase {
     $this->assertEqual(count($view->result), 2, 'Search returned two rows');
     $view->destroy();
 
+    // Test the 'CONTAINS' match_operator.
+    $view = Views::getView('test_display_entity_reference');
+    $view->setDisplay('entity_reference_1');
+    $options = [
+      'match' => 'ex',
+      'match_operator' => 'CONTAINS',
+      'limit' => 0,
+      'ids' => NULL,
+    ];
+    $view->display_handler->setOption('entity_reference_options', $options);
+    $this->executeView($view);
+    $this->assertEqual(count($view->result), 12, 'Search returned twelve rows');
+    $view->destroy();
+
+    // Test the 'STARTS_WITH' match_operator.
+    $view = Views::getView('test_display_entity_reference');
+    $view->setDisplay('entity_reference_1');
+    $options = [
+      'match' => 'tex',
+      'match_operator' => 'STARTS_WITH',
+      'limit' => 0,
+      'ids' => NULL,
+    ];
+    $view->display_handler->setOption('entity_reference_options', $options);
+    $this->executeView($view);
+    $this->assertEqual(count($view->result), 11, 'Search returned eleven rows');
+    $view->destroy();
+
+    // Test the 'ENDS_WITH' match_operator.
+    $view = Views::getView('test_display_entity_reference');
+    $view->setDisplay('entity_reference_1');
+    $options = [
+      'match' => 'ext',
+      'match_operator' => 'ENDS_WITH',
+      'limit' => 0,
+      'ids' => NULL,
+    ];
+    $view->display_handler->setOption('entity_reference_options', $options);
+    $this->executeView($view);
+    $this->assertEqual(count($view->result), 6, 'Search returned six rows');
+    $view->destroy();
+
+    // Test the '=' match_operator.
+    $view = Views::getView('test_display_entity_reference');
+    $view->setDisplay('entity_reference_1');
+    $options = [
+      'match' => 'tex',
+      'match_operator' => '=',
+      'limit' => 0,
+      'ids' => NULL,
+    ];
+    $view->display_handler->setOption('entity_reference_options', $options);
+    $this->executeView($view);
+    $this->assertEqual(count($view->result), 1, 'Search returned one row');
+    $view->destroy();
+
     // Add a relationship and a field using that relationship.
     $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_display_entity_reference/default/relationship', ['name[entity_test.user_id]' => TRUE], t('Add and configure relationships'));
     $this->drupalPostForm(NULL, [], t('Apply'));