diff --git a/src/FilesSidebarTabApp.vue b/src/FilesSidebarTabApp.vue
index b5b6d25c3..f0f8d843a 100644
--- a/src/FilesSidebarTabApp.vue
+++ b/src/FilesSidebarTabApp.vue
@@ -320,10 +320,6 @@ export default {
 }
 
 .chatView {
-	/* The chat view shares its parent with the call button, so the default
-	 * "height: 100%" needs to be unset. */
-	height: unset;
-
 	overflow: hidden;
 }
 </style>
diff --git a/src/mainChatTab.js b/src/mainChatTab.js
index 955ebcd6d..bb523704b 100644
--- a/src/mainChatTab.js
+++ b/src/mainChatTab.js
@@ -36,6 +36,7 @@ import { getRequestToken } from '@nextcloud/auth'
 // Directives
 import contenteditableDirective from 'vue-contenteditable-directive'
 import { translate, translatePlural } from '@nextcloud/l10n'
+import vuescroll from 'vue-scroll'
 
 // CSP config for webpack dynamic chunk loading
 // eslint-disable-next-line
@@ -55,6 +56,7 @@ Vue.prototype.OCA = OCA
 
 Vue.use(contenteditableDirective)
 Vue.use(Vuex)
+Vue.use(vuescroll, { debounce: 600 })
 
 const newTab = () => new Vue({
 	store,