diff --git a/java/com/android/dialer/app/dialpad/DialpadFragment.java b/java/com/android/dialer/app/dialpad/DialpadFragment.java
index d339437..3cd3ac2 100644
--- a/java/com/android/dialer/app/dialpad/DialpadFragment.java
+++ b/java/com/android/dialer/app/dialpad/DialpadFragment.java
@@ -1185,6 +1185,10 @@
         mDialpadView.setVisibility(View.GONE);
       }
 
+      if (mOverflowPopupMenu != null) {
+        mOverflowPopupMenu.dismiss();
+      }
+
       mFloatingActionButtonController.setVisible(false);
       mDialpadChooser.setVisibility(View.VISIBLE);