diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java
index a677ba54c05e8..5d23b07b8e287 100644
--- a/packages/Shell/src/com/android/shell/BugreportProgressService.java
+++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java
@@ -1483,6 +1483,7 @@ public class BugreportProgressService extends Service {
                 // Re-use view, but reset fields first.
                 mDialog.setTitle(dialogTitle);
                 mInfoName.setText(null);
+                mInfoName.setEnabled(true);
                 mInfoTitle.setText(null);
                 mInfoDescription.setText(null);
             }
diff --git a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
index 0b590c0f39b11..c7c7fc5e74914 100644
--- a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
+++ b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
@@ -419,6 +419,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase {
         detailsUi.assertName(NAME);
         detailsUi.assertTitle("");
         detailsUi.assertDescription("");
+        assertTrue("didn't enable name on UI", detailsUi.nameField.isEnabled());
         detailsUi.nameField.setText(NEW_NAME);
         detailsUi.titleField.setText(TITLE);
         detailsUi.descField.setText(DESCRIPTION);
@@ -433,6 +434,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase {
         detailsUi.assertName(NAME2);
         detailsUi.assertTitle("");
         detailsUi.assertDescription("");
+        assertTrue("didn't enable name on UI", detailsUi.nameField.isEnabled());
         detailsUi.nameField.setText(NEW_NAME2);
         detailsUi.titleField.setText(TITLE2);
         detailsUi.descField.setText(DESCRIPTION2);