diff --git a/app/src/main/java/com/github/damontecres/stashapp/MainFragment.kt b/app/src/main/java/com/github/damontecres/stashapp/MainFragment.kt
index 527be93c..e6d54111 100644
--- a/app/src/main/java/com/github/damontecres/stashapp/MainFragment.kt
+++ b/app/src/main/java/com/github/damontecres/stashapp/MainFragment.kt
@@ -158,8 +158,6 @@ class MainFragment : BrowseSupportFragment() {
 
         // set fastLane (or headers) background color
         brandColor = ContextCompat.getColor(requireActivity(), R.color.fastlane_background)
-        // set search icon color
-        searchAffordanceColor = ContextCompat.getColor(requireActivity(), R.color.search_opaque)
     }
 
     private fun setupEventListeners() {
diff --git a/app/src/main/java/com/github/damontecres/stashapp/presenters/PopupOnLongClickListener.kt b/app/src/main/java/com/github/damontecres/stashapp/presenters/PopupOnLongClickListener.kt
index b1ac70ad..d8f7d4f2 100644
--- a/app/src/main/java/com/github/damontecres/stashapp/presenters/PopupOnLongClickListener.kt
+++ b/app/src/main/java/com/github/damontecres/stashapp/presenters/PopupOnLongClickListener.kt
@@ -2,11 +2,10 @@ package com.github.damontecres.stashapp.presenters
 
 import android.view.View
 import android.view.View.OnLongClickListener
-import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import androidx.appcompat.widget.ListPopupWindow
-import com.github.damontecres.stashapp.StashOnFocusChangeListener
+import com.github.damontecres.stashapp.R
 
 /**
  * An OnLongClickListener which shows a popup of predefined options
@@ -24,30 +23,15 @@ class PopupOnLongClickListener(
             )
         listPopUp.inputMethodMode = ListPopupWindow.INPUT_METHOD_NEEDED
         listPopUp.anchorView = view
-        // listPopUp.width = ViewGroup.LayoutParams.MATCH_PARENT
-        // TODO: Better width calculation
-        listPopUp.width = 200
+        listPopUp.width = ListPopupWindow.WRAP_CONTENT
         listPopUp.isModal = true
 
-        val focusChangeListener = StashOnFocusChangeListener(view.context)
-
         val adapter =
-            object : ArrayAdapter<String>(
+            ArrayAdapter(
                 view.context,
-                android.R.layout.simple_list_item_1,
+                R.layout.popup_item,
                 popupOptions,
-            ) {
-                override fun getView(
-                    position: Int,
-                    convertView: View?,
-                    parent: ViewGroup,
-                ): View {
-                    val itemView = super.getView(position, convertView, parent)
-                    // TODO: this doesn't seem to work?
-                    itemView.onFocusChangeListener = focusChangeListener
-                    return itemView
-                }
-            }
+            )
         listPopUp.setAdapter(adapter)
 
         listPopUp.setOnItemClickListener { parent: AdapterView<*>, v: View, position: Int, id: Long ->
diff --git a/app/src/main/res/color/popup_background_selector.xml b/app/src/main/res/color/popup_background_selector.xml
new file mode 100644
index 00000000..b620e14a
--- /dev/null
+++ b/app/src/main/res/color/popup_background_selector.xml
@@ -0,0 +1,4 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:color="@color/popup_selected_background" />
+    <item android:color="@color/popup_background" />
+</selector>
diff --git a/app/src/main/res/layout/popup_item.xml b/app/src/main/res/layout/popup_item.xml
new file mode 100644
index 00000000..83fa19f6
--- /dev/null
+++ b/app/src/main/res/layout/popup_item.xml
@@ -0,0 +1,10 @@
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/popup_item_text"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceListItemSmall"
+    android:background="@color/popup_background_selector"
+    android:gravity="center_vertical"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9fcc07cf..e27c2826 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,9 +2,10 @@
     <color name="background_gradient_start">#000000</color>
     <color name="background_gradient_end">#DDDDDD</color>
     <color name="fastlane_background">#0096a6</color>
-    <color name="search_opaque">#477ab5</color>
     <color name="selected_background">#4785b5</color>
     <color name="default_background">#202b33</color>
     <color name="default_card_background">#30404d</color>
     <color name="gold">#FFD700</color>
+    <color name="popup_selected_background">#3c719a</color>
+    <color name="popup_background">#111a20</color>
 </resources>