diff --git a/app/src/main/res/layout/activity_entry.xml b/app/src/main/res/layout/activity_entry.xml
index 28edbfd86..cee889494 100644
--- a/app/src/main/res/layout/activity_entry.xml
+++ b/app/src/main/res/layout/activity_entry.xml
@@ -108,8 +108,10 @@
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/entry_tags_list_view"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 android:paddingStart="5dp"
                 android:paddingLeft="5dp"
                 android:paddingEnd="5dp"
diff --git a/app/src/main/res/layout/item_tag.xml b/app/src/main/res/layout/item_tag.xml
index 6e6926e40..cb492d3c9 100644
--- a/app/src/main/res/layout/item_tag.xml
+++ b/app/src/main/res/layout/item_tag.xml
@@ -22,8 +22,8 @@
     android:layout_marginLeft="5dp"
     android:layout_marginEnd="5dp"
     android:layout_marginRight="5dp"
-    android:layout_marginTop="10dp"
-    android:layout_marginBottom="1dp"
+    android:layout_marginTop="2dp"
+    android:layout_marginBottom="2dp"
     android:paddingBottom="0dp"
     android:orientation="horizontal">
     <TextView