diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d554fba50..3cbc02719 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -83,6 +83,7 @@
         
         <activity
             android:name="com.android.email.activity.setup.FolderSettings"
+            android:theme="@android:style/Theme.Dialog"
             android:label="@string/folder_settings_title"
             >
         </activity>