diff --git a/src/keepass2android/EntryEditActivity.cs b/src/keepass2android/EntryEditActivity.cs
index cc5e811c..b7edf94d 100644
--- a/src/keepass2android/EntryEditActivity.cs
+++ b/src/keepass2android/EntryEditActivity.cs
@@ -916,9 +916,12 @@ namespace keepass2android
 					foreach (View v in _editModeHiddenViews)
 						v.Visibility = ViewStates.Visible;
                     State.EditMode.ShowAddAttachments = true;
+                    State.EditMode.ShowAddExtras = true;
                     ViewGroup binariesGroup = (ViewGroup)FindViewById(Resource.Id.binaries);
                     binariesGroup.Visibility = ViewStates.Visible;
                     FindViewById(Resource.Id.entry_binaries_container).Visibility = ViewStates.Visible;
+                    ((Button)FindViewById(Resource.Id.add_advanced)).Visibility = ViewStates.Visible;
+                    FindViewById(Resource.Id.entry_extras_container).Visibility = ViewStates.Visible;
 
                     return true;
                 case Android.Resource.Id.Home:
diff --git a/src/keepass2android/EntryEditActivityState.cs b/src/keepass2android/EntryEditActivityState.cs
index 7cebeee7..a3d9e699 100644
--- a/src/keepass2android/EntryEditActivityState.cs
+++ b/src/keepass2android/EntryEditActivityState.cs
@@ -29,12 +29,20 @@ namespace keepass2android
             set { manualShowAddAttachments = value; }
         }
 
-        public virtual bool ShowAddExtras
-	    {
-	        get { return true; }
-	    }
 
-	    public virtual string GetTitle(string key)
+        protected bool? manualShowAddExtras = null;
+
+        public virtual bool ShowAddExtras
+        {
+            get
+            {
+                if (manualShowAddExtras != null) return (bool) manualShowAddExtras; 
+                return true;
+            }
+            set { manualShowAddExtras = value; }
+        }
+
+        public virtual string GetTitle(string key)
 	    {
 	        return key;
 	    }
diff --git a/src/keepass2android/KpEntryTemplatedEdit.cs b/src/keepass2android/KpEntryTemplatedEdit.cs
index 0ed60edc..94baae9d 100644
--- a/src/keepass2android/KpEntryTemplatedEdit.cs
+++ b/src/keepass2android/KpEntryTemplatedEdit.cs
@@ -149,7 +149,10 @@ namespace keepass2android
 
         public override bool ShowAddExtras
 		{
-			get { return false; }
+			get {
+                if (manualShowAddExtras != null) return (bool)manualShowAddExtras;
+                return false;
+            }
 		}
 
 	    public override string GetTitle(string key)