diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3350407635f..10e2e2d9b7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Added `analyzeEvent` glyph in `EuiIcon` ([#3729](https://github.com/elastic/eui/pull/3729))
 - Updated `EuiComboBox` to allow the options list to open for single selection custom options ([#3706](https://github.com/elastic/eui/pull/3706))
 - Added `useEuiI18n` hook for localization ([#3749](https://github.com/elastic/eui/pull/3749))
+- Added a hit enter badge to `EuiComboBox` when focusing an option and for empty states that allow pressing enter ([#3782](https://github.com/elastic/eui/pull/3782))
 
 **Bug fixes**
 
diff --git a/src-docs/src/views/combo_box/combo_box_example.js b/src-docs/src/views/combo_box/combo_box_example.js
index eeed2b83620..69e6381b7c5 100644
--- a/src-docs/src/views/combo_box/combo_box_example.js
+++ b/src-docs/src/views/combo_box/combo_box_example.js
@@ -103,7 +103,7 @@ import DisallowCustomOptions from './disallow_custom_options';
 const disallowCustomOptionsSource = require('!!raw-loader!./disallow_custom_options');
 const disallowCustomOptionsHtml = renderToHtml(DisallowCustomOptions);
 const disallowCustomOptionsSnippet = `<EuiComboBox
-  placeholder="Select from a list of options"
+  placeholder="Select one or more options"
   options={options}
   onChange={onChange}
   onSearchChange={onSearchChange}
@@ -140,7 +140,7 @@ import Virtualized from './virtualized';
 const virtualizedSource = require('!!raw-loader!./virtualized');
 const virtualizedHtml = renderToHtml(Virtualized);
 const virtualizedSnippet = `<EuiComboBox
-  placeholder="Select or create options"
+  placeholder="Select one or more options"
   options={options}
   selectedOptions={selectedOptions}
   onChange={onChange}
diff --git a/src-docs/src/views/combo_box/disallow_custom_options.js b/src-docs/src/views/combo_box/disallow_custom_options.js
index 781356041a6..ad743f56e31 100644
--- a/src-docs/src/views/combo_box/disallow_custom_options.js
+++ b/src-docs/src/views/combo_box/disallow_custom_options.js
@@ -67,7 +67,7 @@ export default () => {
   return (
     <EuiFormRow error={error} isInvalid={error !== undefined}>
       <EuiComboBox
-        placeholder="Select from a list of options"
+        placeholder="Select one or more options"
         options={options}
         selectedOptions={selectedOptions}
         inputRef={setInputRef}
diff --git a/src-docs/src/views/combo_box/single_selection_custom_options.js b/src-docs/src/views/combo_box/single_selection_custom_options.js
index 2f2cc1e9b2c..c7cb9abd863 100644
--- a/src-docs/src/views/combo_box/single_selection_custom_options.js
+++ b/src-docs/src/views/combo_box/single_selection_custom_options.js
@@ -55,7 +55,7 @@ export default () => {
       label="Your occupation"
       helpText="Select an occupation from the list. If your occupation isn’t available, create a custom one.">
       <EuiComboBox
-        placeholder="Select a single occupation"
+        placeholder="Select a single option"
         singleSelection={{ asPlainText: true }}
         options={options}
         selectedOptions={selectedOptions}
diff --git a/src-docs/src/views/combo_box/virtualized.js b/src-docs/src/views/combo_box/virtualized.js
index c7c7a0f46b1..143e2fd83fb 100644
--- a/src-docs/src/views/combo_box/virtualized.js
+++ b/src-docs/src/views/combo_box/virtualized.js
@@ -24,7 +24,7 @@ export default () => {
 
   return (
     <EuiComboBox
-      placeholder="Select or create options"
+      placeholder="Select one or more options"
       options={options}
       selectedOptions={selectedOptions}
       onChange={onChange}
diff --git a/src/components/combo_box/__snapshots__/combo_box.test.tsx.snap b/src/components/combo_box/__snapshots__/combo_box.test.tsx.snap
index 8e4e3329142..a4ab0827043 100644
--- a/src/components/combo_box/__snapshots__/combo_box.test.tsx.snap
+++ b/src/components/combo_box/__snapshots__/combo_box.test.tsx.snap
@@ -338,15 +338,19 @@ exports[`props options list is rendered 1`] = `
             <span
               class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
             >
-              <div
+              <span
                 class="euiFlexItem euiFilterSelectItem__content"
               >
                 <span
-                  class="euiComboBoxOption__content"
+                  class="euiComboBoxOption__contentWrapper"
                 >
-                  Titan
+                  <span
+                    class="euiComboBoxOption__content"
+                  >
+                    Titan
+                  </span>
                 </span>
-              </div>
+              </span>
             </span>
           </button>
           <button
@@ -361,15 +365,19 @@ exports[`props options list is rendered 1`] = `
             <span
               class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
             >
-              <div
+              <span
                 class="euiFlexItem euiFilterSelectItem__content"
               >
                 <span
-                  class="euiComboBoxOption__content"
+                  class="euiComboBoxOption__contentWrapper"
                 >
-                  Enceladus
+                  <span
+                    class="euiComboBoxOption__content"
+                  >
+                    Enceladus
+                  </span>
                 </span>
-              </div>
+              </span>
             </span>
           </button>
           <button
@@ -384,15 +392,19 @@ exports[`props options list is rendered 1`] = `
             <span
               class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
             >
-              <div
+              <span
                 class="euiFlexItem euiFilterSelectItem__content"
               >
                 <span
-                  class="euiComboBoxOption__content"
+                  class="euiComboBoxOption__contentWrapper"
                 >
-                  Mimas
+                  <span
+                    class="euiComboBoxOption__content"
+                  >
+                    Mimas
+                  </span>
                 </span>
-              </div>
+              </span>
             </span>
           </button>
           <button
@@ -407,15 +419,19 @@ exports[`props options list is rendered 1`] = `
             <span
               class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
             >
-              <div
+              <span
                 class="euiFlexItem euiFilterSelectItem__content"
               >
                 <span
-                  class="euiComboBoxOption__content"
+                  class="euiComboBoxOption__contentWrapper"
                 >
-                  Dione
+                  <span
+                    class="euiComboBoxOption__content"
+                  >
+                    Dione
+                  </span>
                 </span>
-              </div>
+              </span>
             </span>
           </button>
           <button
@@ -430,15 +446,19 @@ exports[`props options list is rendered 1`] = `
             <span
               class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
             >
-              <div
+              <span
                 class="euiFlexItem euiFilterSelectItem__content"
               >
                 <span
-                  class="euiComboBoxOption__content"
+                  class="euiComboBoxOption__contentWrapper"
                 >
-                  Iapetus
+                  <span
+                    class="euiComboBoxOption__content"
+                  >
+                    Iapetus
+                  </span>
                 </span>
-              </div>
+              </span>
             </span>
           </button>
           <button
@@ -453,15 +473,19 @@ exports[`props options list is rendered 1`] = `
             <span
               class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
             >
-              <div
+              <span
                 class="euiFlexItem euiFilterSelectItem__content"
               >
                 <span
-                  class="euiComboBoxOption__content"
+                  class="euiComboBoxOption__contentWrapper"
                 >
-                  Phoebe
+                  <span
+                    class="euiComboBoxOption__content"
+                  >
+                    Phoebe
+                  </span>
                 </span>
-              </div>
+              </span>
             </span>
           </button>
           <button
@@ -476,15 +500,19 @@ exports[`props options list is rendered 1`] = `
             <span
               class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
             >
-              <div
+              <span
                 class="euiFlexItem euiFilterSelectItem__content"
               >
                 <span
-                  class="euiComboBoxOption__content"
+                  class="euiComboBoxOption__contentWrapper"
                 >
-                  Rhea
+                  <span
+                    class="euiComboBoxOption__content"
+                  >
+                    Rhea
+                  </span>
                 </span>
-              </div>
+              </span>
             </span>
           </button>
           <button
@@ -499,15 +527,19 @@ exports[`props options list is rendered 1`] = `
             <span
               class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
             >
-              <div
+              <span
                 class="euiFlexItem euiFilterSelectItem__content"
               >
                 <span
-                  class="euiComboBoxOption__content"
+                  class="euiComboBoxOption__contentWrapper"
                 >
-                  Pandora is one of Saturn's moons, named for a Titaness of Greek mythology
+                  <span
+                    class="euiComboBoxOption__content"
+                  >
+                    Pandora is one of Saturn's moons, named for a Titaness of Greek mythology
+                  </span>
                 </span>
-              </div>
+              </span>
             </span>
           </button>
           <button
@@ -522,15 +554,19 @@ exports[`props options list is rendered 1`] = `
             <span
               class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
             >
-              <div
+              <span
                 class="euiFlexItem euiFilterSelectItem__content"
               >
                 <span
-                  class="euiComboBoxOption__content"
+                  class="euiComboBoxOption__contentWrapper"
                 >
-                  Tethys
+                  <span
+                    class="euiComboBoxOption__content"
+                  >
+                    Tethys
+                  </span>
                 </span>
-              </div>
+              </span>
             </span>
           </button>
         </div>
diff --git a/src/components/combo_box/combo_box_options_list/_combo_box_option.scss b/src/components/combo_box/combo_box_options_list/_combo_box_option.scss
index 2a192e85c8f..4c227f52a1a 100644
--- a/src/components/combo_box/combo_box_options_list/_combo_box_option.scss
+++ b/src/components/combo_box/combo_box_options_list/_combo_box_option.scss
@@ -28,8 +28,30 @@
   }
 }
 
+.euiComboBoxOption__contentWrapper {
+  display: flex;
+
+  .euiComboBoxOption__emptyStateText {
+    flex: 1;
+    text-align: left;
+    margin-bottom: 0;
+  }
+
+  .euiComboBoxOption__enterBadge {
+    align-self: flex-start;
+    margin-left: $euiSizeXS;
+
+    span {
+      display: flex;
+      align-items: center;
+    }
+  }
+}
+
 .euiComboBoxOption__content {
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: nowrap;
+  flex: 1;
+  text-align: left;
 }
diff --git a/src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx b/src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx
index c12be6f3946..16c2492f63a 100644
--- a/src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx
+++ b/src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx
@@ -30,7 +30,6 @@ import {
   ListChildComponentProps,
 } from 'react-window';
 
-import { EuiCode } from '../../../components/code';
 import { EuiFlexGroup, EuiFlexItem } from '../../flex';
 import { EuiHighlight } from '../../highlight';
 import { EuiPanel } from '../../panel';
@@ -38,6 +37,7 @@ import { EuiText } from '../../text';
 import { EuiLoadingSpinner } from '../../loading';
 import { EuiComboBoxTitle } from './combo_box_title';
 import { EuiI18n } from '../../i18n';
+import { EuiIcon } from '../../icon';
 import {
   EuiFilterSelectItem,
   FilterChecked,
@@ -52,6 +52,7 @@ import {
   UpdatePositionHandler,
 } from '../types';
 import { CommonProps } from '../../common';
+import { EuiBadge } from '../../badge/';
 
 const positionToClassNameMap: {
   [position in EuiComboBoxOptionsListPosition]: string
@@ -103,6 +104,15 @@ export type EuiComboBoxOptionsListProps<T> = CommonProps &
     zIndex?: number;
   };
 
+const hitEnterBadge = (
+  <EuiBadge
+    className="euiComboBoxOption__enterBadge"
+    color="hollow"
+    aria-hidden="true">
+    <EuiIcon type="returnKey" />
+  </EuiBadge>
+);
+
 export class EuiComboBoxOptionsList<T> extends Component<
   EuiComboBoxOptionsListProps<T>
 > {
@@ -228,6 +238,10 @@ export class EuiComboBoxOptionsList<T> extends Component<
       checked = 'on';
     }
 
+    const optionIsFocused = activeOptionIndex === index;
+    const optionIsDisabled =
+      option.hasOwnProperty('disabled') && option.disabled === true;
+
     return (
       <EuiFilterSelectItem
         style={style}
@@ -238,21 +252,30 @@ export class EuiComboBoxOptionsList<T> extends Component<
           }
         }}
         ref={optionRef.bind(this, index)}
-        isFocused={activeOptionIndex === index}
+        isFocused={optionIsFocused}
         checked={checked}
         showIcons={singleSelection ? true : false}
         id={rootId(`_option-${index}`)}
         title={label}
         {...rest}>
-        {renderOption ? (
-          renderOption(option, searchValue, OPTION_CONTENT_CLASSNAME)
-        ) : (
-          <EuiHighlight
-            search={searchValue}
-            className={OPTION_CONTENT_CLASSNAME}>
-            {label}
-          </EuiHighlight>
-        )}
+        <span className="euiComboBoxOption__contentWrapper">
+          {renderOption ? (
+            <span className={OPTION_CONTENT_CLASSNAME}>
+              {renderOption(
+                option,
+                searchValue,
+                'euiComboBoxOption__renderOption'
+              )}
+            </span>
+          ) : (
+            <EuiHighlight
+              search={searchValue}
+              className={OPTION_CONTENT_CLASSNAME}>
+              {label}
+            </EuiHighlight>
+          )}
+          {optionIsFocused && !optionIsDisabled ? hitEnterBadge : null}
+        </span>
       </EuiFilterSelectItem>
     );
   };
@@ -327,28 +350,33 @@ export class EuiComboBoxOptionsList<T> extends Component<
           );
         } else {
           emptyStateContent = (
-            <p>
-              <EuiI18n
-                token="euiComboBoxOptionsList.createCustomOption"
-                default="Hit {key} to add {searchValue} as a custom option"
-                values={{
-                  key: <EuiCode>ENTER</EuiCode>,
-                  searchValue: <strong>{searchValue}</strong>,
-                }}
-              />
-            </p>
+            <div className="euiComboBoxOption__contentWrapper">
+              <p className="euiComboBoxOption__emptyStateText">
+                <EuiI18n
+                  token="euiComboBoxOptionsList.createCustomOption"
+                  default="Add {searchValue} as a custom option"
+                  values={{
+                    searchValue: <strong>{searchValue}</strong>,
+                  }}
+                />
+              </p>
+              {hitEnterBadge}
+            </div>
           );
         }
       } else {
         if (delimiter && searchValue.includes(delimiter)) {
           emptyStateContent = (
-            <p>
-              <EuiI18n
-                token="euiComboBoxOptionsList.delimiterMessage"
-                default="Hit enter to add each item separated by {delimiter}"
-                values={{ delimiter: <strong>{delimiter}</strong> }}
-              />
-            </p>
+            <div className="euiComboBoxOption__contentWrapper">
+              <p className="euiComboBoxOption__emptyStateText">
+                <EuiI18n
+                  token="euiComboBoxOptionsList.delimiterMessage"
+                  default="Add each item separated by {delimiter}"
+                  values={{ delimiter: <strong>{delimiter}</strong> }}
+                />
+              </p>
+              {hitEnterBadge}
+            </div>
           );
         } else {
           emptyStateContent = (
diff --git a/src/components/filter_group/__snapshots__/filter_select_item.test.tsx.snap b/src/components/filter_group/__snapshots__/filter_select_item.test.tsx.snap
index f42a23a969a..2cbc746edea 100644
--- a/src/components/filter_group/__snapshots__/filter_select_item.test.tsx.snap
+++ b/src/components/filter_group/__snapshots__/filter_select_item.test.tsx.snap
@@ -18,7 +18,7 @@ exports[`EuiFilterSelectItem is rendered 1`] = `
         data-euiicon-type="empty"
       />
     </div>
-    <div
+    <span
       class="euiFlexItem euiFilterSelectItem__content"
     />
   </span>
diff --git a/src/components/filter_group/filter_select_item.tsx b/src/components/filter_group/filter_select_item.tsx
index fe3d20c6c15..6f6cb7fe264 100644
--- a/src/components/filter_group/filter_select_item.tsx
+++ b/src/components/filter_group/filter_select_item.tsx
@@ -115,7 +115,9 @@ export class EuiFilterSelectItem extends Component<EuiFilterSelectItemProps> {
           component="span"
           responsive={false}>
           {iconNode}
-          <EuiFlexItem className="euiFilterSelectItem__content">
+          <EuiFlexItem
+            className="euiFilterSelectItem__content"
+            component="span">
             {children}
           </EuiFlexItem>
         </EuiFlexGroup>