diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php
index dadba496b..3dd91cffe 100644
--- a/lib/Listeners/BeforeTemplateRenderedListener.php
+++ b/lib/Listeners/BeforeTemplateRenderedListener.php
@@ -29,9 +29,16 @@
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
+use OCP\IRequest;
 use OCP\Util;
 
 class BeforeTemplateRenderedListener implements IEventListener {
+	private $request;
+
+	public function __construct(IRequest $request) {
+		$this->request = $request;
+	}
+
 	public function handle(Event $event): void {
 		if (!($event instanceof BeforeTemplateRenderedEvent)) {
 			return;
@@ -41,5 +48,9 @@ public function handle(Event $event): void {
 			return;
 		}
 		Util::addStyle('deck', 'deck');
+
+		if (strpos($this->request->getPathInfo(), '/apps/calendar') === 0) {
+			Util::addScript('deck', 'calendar');
+		}
 	}
 }
diff --git a/src/init-calendar.js b/src/init-calendar.js
new file mode 100644
index 000000000..375524fe5
--- /dev/null
+++ b/src/init-calendar.js
@@ -0,0 +1,34 @@
+/*
+ * @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import { subscribe } from '@nextcloud/event-bus'
+import { generateUrl } from '@nextcloud/router'
+
+subscribe('calendar:handle-todo-click', ({ calendarId, taskId }) => {
+	const deckAppPrefix = 'app-generated--deck--board-'
+	if (calendarId.startsWith(deckAppPrefix)) {
+		const board = calendarId.substr(deckAppPrefix.length)
+		const card = taskId.substr('card-'.length).replace('.ics', '')
+		console.debug('[deck] Clicked task matches deck calendar pattern')
+		window.location = generateUrl(`apps/deck/#/board/${board}/card/${card}`)
+	}
+})
diff --git a/webpack.js b/webpack.js
index 0cb459151..f65b20653 100644
--- a/webpack.js
+++ b/webpack.js
@@ -6,6 +6,7 @@ const config = {
 	entry: {
 		collections: path.join(__dirname, 'src', 'init-collections.js'),
 		dashboard: path.join(__dirname, 'src', 'init-dashboard.js'),
+		calendar: path.join(__dirname, 'src', 'init-calendar.js'),
 	},
 	output: {
 		filename: '[name].js',