diff --git a/src/components/card/CardSidebar.vue b/src/components/card/CardSidebar.vue
index 68f4e6d34..e32dde4c1 100644
--- a/src/components/card/CardSidebar.vue
+++ b/src/components/card/CardSidebar.vue
@@ -36,7 +36,10 @@
 						:taggable="true" label="title"
 						track-by="id" @select="addLabelToCard" @remove="removeLabelFromCard">
 						<template #option="scope">
-							<div :style="{ color: '#' + scope.option.color}">{{ scope.option.title }}</div>
+							<div :style="{ backgroundColor: '#' + scope.option.color, color: textColor(scope.option.color)}" class="tag">{{ scope.option.title }}</div>
+						</template>
+						<template #tag="scope">
+							<div :style="{ backgroundColor: '#' + scope.option.color, color: textColor(scope.option.color)}" class="tag">{{ scope.option.title }}</div>
 						</template>
 					</multiselect>
 				</div>
@@ -93,6 +96,7 @@ import VueEasymde from 'vue-easymde'
 import { Actions } from 'nextcloud-vue/dist/Components/Actions'
 import { ActionButton } from 'nextcloud-vue/dist/Components/ActionButton'
 import ActivityEntry from '../ActivityEntry'
+import Color from '../../mixins/color'
 
 export default {
 	name: 'CardSidebar',
@@ -107,6 +111,9 @@ export default {
 		ActionButton,
 		Avatar
 	},
+	mixins: [
+		Color
+	],
 	props: {
 		id: {
 			type: Number,
@@ -319,6 +326,16 @@ export default {
 		}
 	}
 
+	.tag {
+		flex-grow: 0;
+		flex-shrink: 1;
+		overflow: hidden;
+		padding: 1px 3px;
+		border-radius: 3px;
+		font-size: 85%;
+		margin-right: 3px;
+	}
+
 	.avatarLabel {
 		padding: 6px
 	}
diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index 913203233..8012b1901 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -183,17 +183,39 @@ export default {
 		}
 
 		.labels {
+			flex-grow: 1;
+			flex-shrink: 1;
+			min-width: 0;
+			display: flex;
+			flex-direction: row;
 			margin-left: $card-padding;
+			margin-right: $card-padding;
 			margin-top: -5px;
-			overflow: hidden;
 
 			li {
-				float: left;
+				flex-grow: 0;
+				flex-shrink: 1;
+				display: flex;
+				flex-direction: row;
+				overflow: hidden;
 				padding: 1px 3px;
 				border-radius: 3px;
 				font-size: 85%;
 				margin-right: 3px;
 				margin-bottom: 3px;
+
+				&:hover {
+					overflow: unset;
+				}
+
+				span {
+					flex-grow: 0;
+					flex-shrink: 1;
+					min-width: 0;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
 			}
 		}