diff --git a/src/components/card/CardSidebar.vue b/src/components/card/CardSidebar.vue
index 2060c0c0a..8eb22fd4f 100644
--- a/src/components/card/CardSidebar.vue
+++ b/src/components/card/CardSidebar.vue
@@ -22,6 +22,7 @@
 
 <template>
 	<AppSidebar v-if="currentBoard && currentCard"
+		:active="tabId"
 		:title="title"
 		:subtitle="subtitle"
 		:title-editable="titleEditable"
@@ -65,7 +66,7 @@
 			:order="2"
 			:name="t('deck', 'Comments')"
 			icon="icon-comment">
-			<CardSidebarTabComments :card="currentCard" />
+			<CardSidebarTabComments :card="currentCard" :tab-query="tabQuery" />
 		</AppSidebarTab>
 
 		<AppSidebarTab v-if="hasActivity"
@@ -109,6 +110,16 @@ export default {
 			type: Number,
 			required: true,
 		},
+		tabId: {
+			type: String,
+			required: false,
+			default: null,
+		},
+		tabQuery: {
+			type: String,
+			required: false,
+			default: null,
+		},
 	},
 	data() {
 		return {
diff --git a/src/components/card/CardSidebarTabComments.vue b/src/components/card/CardSidebarTabComments.vue
index b1779d363..ffbac760c 100644
--- a/src/components/card/CardSidebarTabComments.vue
+++ b/src/components/card/CardSidebarTabComments.vue
@@ -49,6 +49,11 @@ export default {
 			type: Object,
 			default: undefined,
 		},
+		tabQuery: {
+			type: String,
+			required: false,
+			default: null,
+		},
 	},
 	data() {
 		return {
diff --git a/src/router.js b/src/router.js
index 4e7b1d64b..ca0657395 100644
--- a/src/router.js
+++ b/src/router.js
@@ -116,7 +116,7 @@ export default new Router({
 					},
 				},
 				{
-					path: 'card/:cardId',
+					path: 'card/:cardId/:tabId?/:tabQuery?',
 					name: 'card',
 					components: {
 						sidebar: CardSidebar,
@@ -130,6 +130,8 @@ export default new Router({
 						sidebar: (route) => {
 							return {
 								id: parseInt(route.params.cardId, 10),
+								tabId: route.params.tabId,
+								tabQuery: route.params.tabQuery,
 							}
 						},
 					},