diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java
index 00d28fe..04f1431 100644
--- a/java/com/android/dialer/app/DialtactsActivity.java
+++ b/java/com/android/dialer/app/DialtactsActivity.java
@@ -517,6 +517,14 @@
       PostCall.promptUserForMessageIfNecessary(this, mParentLayout);
     }
 
+    // On M the fragment manager does not restore the hidden state of a fragment from
+    // savedInstanceState so it must be hidden again.
+    if (!mIsDialpadShown && mDialpadFragment != null && !mDialpadFragment.isHidden()) {
+      LogUtil.i(
+          "DialtactsActivity.onResume", "mDialpadFragment attached but not hidden, forcing hide");
+      getFragmentManager().beginTransaction().hide(mDialpadFragment).commit();
+    }
+
     // If there was a voice query result returned in the {@link #onActivityResult} callback, it
     // will have been stashed in mVoiceSearchQuery since the search results fragment cannot be
     // shown until onResume has completed.  Active the search UI and set the search term now.