diff --git a/app/src/main/java/com/keepassdroid/activities/EntryActivity.java b/app/src/main/java/com/keepassdroid/activities/EntryActivity.java
index cf987762c..79158e617 100644
--- a/app/src/main/java/com/keepassdroid/activities/EntryActivity.java
+++ b/app/src/main/java/com/keepassdroid/activities/EntryActivity.java
@@ -280,6 +280,7 @@ public class EntryActivity extends LockingHideActivity {
inflater.inflate(R.menu.database_lock, menu);
MenuItem togglePassword = menu.findItem(R.id.menu_toggle_pass);
+ // TODO Refresh if change
if (entryContentsView != null && togglePassword != null) {
if (!entryContentsView.isPasswordPresent()) {
togglePassword.setVisible(false);
diff --git a/app/src/main/res/layout/entry_new_field.xml b/app/src/main/res/layout/entry_new_field.xml
index 723e5b251..d132c60b7 100644
--- a/app/src/main/res/layout/entry_new_field.xml
+++ b/app/src/main/res/layout/entry_new_field.xml
@@ -31,6 +31,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/title"
+ android:layout_toLeftOf="@+id/action_image"
+ android:layout_toStartOf="@+id/action_image"
android:textIsSelectable="true"
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
-
+ android:layout_toLeftOf="@+id/entry_password_action_image"
+ android:layout_toStartOf="@+id/entry_password_action_image">
+
+