diff --git a/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt b/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt
index 8b2a11828..c3cd9a03f 100644
--- a/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt
@@ -54,6 +54,7 @@ class EntryContentsView @JvmOverloads constructor(context: Context, attrs: Attri
     private val commentContainerView: View
     private val commentView: TextView
 
+    private val extrasContainerView: View
     private val extrasView: ViewGroup
 
     private val dateFormat: DateFormat = android.text.format.DateFormat.getDateFormat(context)
@@ -88,6 +89,7 @@ class EntryContentsView @JvmOverloads constructor(context: Context, attrs: Attri
         commentContainerView = findViewById(R.id.entry_notes_container)
         commentView = findViewById(R.id.entry_notes)
 
+        extrasContainerView = findViewById(R.id.extra_strings_container)
         extrasView = findViewById(R.id.extra_strings)
 
         creationDateView = findViewById(R.id.entry_created)
@@ -204,10 +206,12 @@ class EntryContentsView @JvmOverloads constructor(context: Context, attrs: Attri
             entryCustomField = EntryCustomField(context, null, title, value, showAction, onActionClickListener)
         entryCustomField.applyFontVisibility(fontInVisibility)
         extrasView.addView(entryCustomField)
+        extrasContainerView.visibility = View.VISIBLE
     }
 
     fun clearExtraFields() {
         extrasView.removeAllViews()
+        extrasContainerView.visibility = View.GONE
     }
 
     private fun getDateTime(date: Date): String {
diff --git a/app/src/main/res/layout/view_entry_contents.xml b/app/src/main/res/layout/view_entry_contents.xml
index bcd7a3a26..9812c4ce8 100644
--- a/app/src/main/res/layout/view_entry_contents.xml
+++ b/app/src/main/res/layout/view_entry_contents.xml
@@ -154,8 +154,10 @@
 
     <!-- Extras -->
 	<android.support.v7.widget.CardView
+		android:id="@+id/extra_strings_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:visibility="gone"
 		android:layout_marginStart="@dimen/default_margin"
 		android:layout_marginEnd="@dimen/default_margin"
 		android:layout_marginBottom="@dimen/default_margin">