diff --git a/ui/component/wunderbarSuggestions/view.jsx b/ui/component/wunderbarSuggestions/view.jsx
index 79510c3fa..b2f7003c4 100644
--- a/ui/component/wunderbarSuggestions/view.jsx
+++ b/ui/component/wunderbarSuggestions/view.jsx
@@ -64,11 +64,7 @@ export default function WunderBarSuggestions(props: Props) {
     customSelectAction,
   } = props;
   const inputRef: ElementRef<any> = React.useRef();
-  const viewResultsRef: ElementRef<any> = React.useRef();
-  const exploreTagRef: ElementRef<any> = React.useRef();
-
-  const isRefFocused = (ref) => ref && ref.current && ref.current === document.activeElement;
-  const isFocused = isRefFocused(inputRef) || isRefFocused(viewResultsRef) || isRefFocused(exploreTagRef);
+  const isFocused = inputRef && inputRef.current && inputRef.current === document.activeElement;
 
   const {
     push,
@@ -325,22 +321,6 @@ export default function WunderBarSuggestions(props: Props) {
               className={classnames('wunderbar__suggestions', { 'wunderbar__suggestions--mobile': isMobile })}
             >
               <ComboboxList>
-                {!noBottomLinks && (
-                  <div className="wunderbar__bottom-links">
-                    <ComboboxOption value={term} className="wunderbar__more-results">
-                      <Button ref={viewResultsRef} button="link" label={__('View All Results')} />
-                    </ComboboxOption>
-                    <ComboboxOption value={`${TAG_SEARCH_PREFIX}${term}`} className="wunderbar__more-results">
-                      <Button ref={exploreTagRef} className="wunderbar__tag-search" button="link">
-                        {__('Explore')}
-                        <div className="tag">{term.split(' ').join('')}</div>
-                      </Button>
-                    </ComboboxOption>
-                  </div>
-                )}
-
-                <hr className="wunderbar__top-separator" />
-
                 {uriFromQueryIsValid && !noTopSuggestion ? <WunderbarTopSuggestion query={nameFromQuery} /> : null}
 
                 <div className="wunderbar__label">{__('Search Results')}</div>
@@ -350,6 +330,20 @@ export default function WunderBarSuggestions(props: Props) {
                 {!showPlaceholder && results
                   ? results.slice(0, isMobile ? 20 : 5).map((uri) => <WunderbarSuggestion key={uri} uri={uri} />)
                   : null}
+
+                {!noBottomLinks && (
+                  <div className="wunderbar__bottom-links">
+                    <ComboboxOption value={term} className="wunderbar__more-results">
+                      <Button button="link" label={__('View All Results')} />
+                    </ComboboxOption>
+                    <ComboboxOption value={`${TAG_SEARCH_PREFIX}${term}`} className="wunderbar__more-results">
+                      <Button className="wunderbar__tag-search" button="link">
+                        {__('Explore')}
+                        <div className="tag">{term.split(' ').join('')}</div>
+                      </Button>
+                    </ComboboxOption>
+                  </div>
+                )}
               </ComboboxList>
             </ComboboxPopover>
           )}
diff --git a/ui/scss/component/_claim-list.scss b/ui/scss/component/_claim-list.scss
index 724c8f331..aece45bcb 100644
--- a/ui/scss/component/_claim-list.scss
+++ b/ui/scss/component/_claim-list.scss
@@ -19,6 +19,8 @@
 
 .claim-list__dropdown {
   padding: 0 var(--spacing-m);
+  padding-right: var(--spacing-xl);
+  background-position: right var(--spacing-m) center;
 
   @media (max-width: $breakpoint-small) {
     margin-left: 0;
diff --git a/ui/scss/component/_claim-search.scss b/ui/scss/component/_claim-search.scss
index f2db0239d..246b4d2e9 100644
--- a/ui/scss/component/_claim-search.scss
+++ b/ui/scss/component/_claim-search.scss
@@ -26,9 +26,10 @@
 
 .claim-search__dropdown {
   padding: 0 var(--spacing-m);
-  padding-right: var(--spacing-l);
+  padding-right: var(--spacing-xl);
   font-size: var(--font-body);
   background-color: var(--color-card-background);
+  background-position: right var(--spacing-m) center;
 }
 
 .claim-search__dropdown--selected {
diff --git a/ui/scss/component/_form-field.scss b/ui/scss/component/_form-field.scss
index 4398d9858..0933a87be 100644
--- a/ui/scss/component/_form-field.scss
+++ b/ui/scss/component/_form-field.scss
@@ -45,10 +45,10 @@ select {
 
 select {
   background-image: var(--select-toggle-background);
-  background-position: 99% center;
+  background-position: right var(--spacing-s) center;
   background-repeat: no-repeat;
   background-size: 1rem;
-  padding-right: var(--spacing-l);
+  padding-right: var(--spacing-xl);
   padding-left: var(--spacing-s);
   font-weight: bold;
 }
diff --git a/ui/scss/component/_wunderbar.scss b/ui/scss/component/_wunderbar.scss
index 0645b6de7..6d88871da 100644
--- a/ui/scss/component/_wunderbar.scss
+++ b/ui/scss/component/_wunderbar.scss
@@ -264,17 +264,6 @@
   :first-child {
     flex: 1;
   }
-
-  .wunderbar__more-results {
-    margin-top: 0;
-    margin-left: var(--spacing-xxs);
-    margin-bottom: 0;
-
-    @media (min-width: $breakpoint-small) {
-      margin-top: var(--spacing-xxs);
-      margin-bottom: 0;
-    }
-  }
 }
 
 [data-reach-combobox-option] {