diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index 57d48831..3d862723 100644
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -40,6 +40,7 @@
                     android:fontFamily="sans-serif-medium"
                     android:gravity="center_vertical"
                     android:hint="@string/album"
+                    android:inputType="text|textCapWords"
                     android:paddingBottom="8dp"
                     android:paddingTop="8dp"
                     android:singleLine="true"
@@ -77,6 +78,7 @@
                         android:fontFamily="sans-serif"
                         android:gravity="center_vertical"
                         android:hint="@string/album_artist"
+                        android:inputType="text|textCapWords"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
                         android:textColor="?attr/title_text_color" />
@@ -104,6 +106,7 @@
                         android:fontFamily="sans-serif"
                         android:gravity="center_vertical"
                         android:hint="@string/genre"
+                        android:inputType="text|textCapWords"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
                         android:textColor="?attr/title_text_color" />
@@ -131,7 +134,7 @@
                         android:fontFamily="sans-serif"
                         android:gravity="center_vertical"
                         android:hint="@string/year"
-                        android:inputType="numberDecimal"
+                        android:inputType="text|number"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
                         android:textColor="?attr/title_text_color" />
diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml
index d1d29682..c31c9ce1 100644
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -40,6 +40,7 @@
                     android:fontFamily="sans-serif-medium"
                     android:gravity="center_vertical"
                     android:hint="@string/song"
+                    android:inputType="text|textCapWords"
                     android:paddingBottom="8dp"
                     android:paddingTop="8dp"
                     android:singleLine="true"
@@ -53,6 +54,7 @@
                     android:fontFamily="sans-serif-medium"
                     android:gravity="center_vertical"
                     android:hint="@string/album"
+                    android:inputType="text|textCapWords"
                     android:paddingBottom="8dp"
                     android:paddingTop="8dp"
                     android:singleLine="true"
@@ -90,6 +92,7 @@
                         android:fontFamily="sans-serif"
                         android:gravity="center_vertical"
                         android:hint="@string/artist"
+                        android:inputType="text|textCapWords"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
                         android:textColor="?attr/title_text_color" />
@@ -106,6 +109,7 @@
                         android:fontFamily="sans-serif"
                         android:singleLine="true"
                         android:text="@string/genre"
+                        android:inputType="text|textCapWords"
                         android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
 
                     <com.kabouzeid.gramophone.views.DynamicEditText
@@ -142,7 +146,7 @@
                         android:fontFamily="sans-serif"
                         android:gravity="center_vertical"
                         android:hint="@string/year"
-                        android:inputType="numberDecimal"
+                        android:inputType="text|number"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
                         android:textColor="?attr/title_text_color" />
@@ -169,7 +173,7 @@
                         android:fontFamily="sans-serif"
                         android:gravity="center_vertical"
                         android:hint="@string/track_hint"
-                        android:inputType="numberDecimal"
+                        android:inputType="text|number"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
                         android:textColor="?attr/title_text_color" />