diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.kt b/quickstep/src/com/android/quickstep/views/TaskMenuView.kt
index 4d4ce4e583..f7cb7bef78 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.kt
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.kt
@@ -251,6 +251,7 @@ constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int = 0) :
         rotation = orientationHandler.degreesRotated
 
         if (enableOverviewIconMenu()) {
+            elevation = resources.getDimension(R.dimen.task_thumbnail_icon_menu_elevation)
             translationX = thumbnailAlignedX
             translationY = thumbnailAlignedY
         } else {
@@ -472,8 +473,8 @@ constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int = 0) :
             val isLastMenuOptionFocused =
                 optionLayout.indexOfChild(optionLayout.focusedChild) == optionLayout.childCount - 1
             if (
-                (isLastMenuOptionFocused && event.keyCode == KeyEvent.KEYCODE_DPAD_DOWN)
-                || (isFirstMenuOptionFocused && event.keyCode == KeyEvent.KEYCODE_DPAD_UP)
+                (isLastMenuOptionFocused && event.keyCode == KeyEvent.KEYCODE_DPAD_DOWN) ||
+                    (isFirstMenuOptionFocused && event.keyCode == KeyEvent.KEYCODE_DPAD_UP)
             ) {
                 iconView.requestFocus()
                 return true