diff --git a/ui/component/wunderbar/view.jsx b/ui/component/wunderbar/view.jsx
index 31164df0c..ab4860433 100644
--- a/ui/component/wunderbar/view.jsx
+++ b/ui/component/wunderbar/view.jsx
@@ -204,7 +204,7 @@ class WunderBar extends React.PureComponent<Props, State> {
             >
               <Icon icon={this.getSuggestionIcon(type)} />
               <span className="wunderbar__suggestion-label">
-                {type === SEARCH_TYPES.TAG ? <Tag name={value} /> : shorthand}
+                {type === SEARCH_TYPES.TAG ? <Tag name={value} /> : shorthand || value}
               </span>
               {isHighlighted && (
                 <span className="wunderbar__suggestion-label--action">