diff --git a/src/components/home/TheNavigation.vue b/src/components/home/TheNavigation.vue
index 9b9f9245b..0b7161494 100644
--- a/src/components/home/TheNavigation.vue
+++ b/src/components/home/TheNavigation.vue
@@ -33,8 +33,10 @@
 			<notifications/>
 			<div class="user">
 				<dropdown class="is-right" ref="usernameDropdown">
-					<template #trigger>
+					<template #trigger="{toggleOpen}">
 						<x-button
+							class="username-dropdown-trigger"
+							@click="toggleOpen()"
 							variant="secondary"
 							:shadow="false"
 						>
@@ -203,16 +205,13 @@ $hamburger-menu-icon-width: 28px;
 			display: flex;
 			align-items: center;
 
-			:deep(.dropdown-trigger) {
+			.username-dropdown-trigger {
 				line-height: 1;
+				padding: 0 0.25rem;
+				height: 1rem;
 
-				.button {
-					padding: 0 0.25rem;
-					height: 1rem;
-
-					.icon {
-						width: .5rem;
-					}
+				.icon {
+					width: .5rem;
 				}
 			}
 
@@ -254,7 +253,7 @@ $hamburger-menu-icon-width: 28px;
 			margin-right: var(--button-padding-horizontal);
 		}
 
-		:deep(.dropdown-trigger .button) {
+		.username-dropdown-trigger {
 			background: none;
 
 			&:focus:not(:active), &:active {
diff --git a/src/components/misc/dropdown.vue b/src/components/misc/dropdown.vue
index 7e3d7cb62..8ab825a32 100644
--- a/src/components/misc/dropdown.vue
+++ b/src/components/misc/dropdown.vue
@@ -1,10 +1,11 @@
 <template>
 	<div class="dropdown is-right is-active" ref="dropdown">
-		<div class="dropdown-trigger is-flex" @click="open = !open">
-			<slot name="trigger" :close="close">
+		<slot name="trigger" :close="close" :toggleOpen="toggleOpen">
+			<BaseButton class="dropdown-trigger is-flex" @click="toggleOpen">
 				<icon :icon="triggerIcon" class="icon"/>
-			</slot>
-		</div>
+			</BaseButton>
+		</slot>
+
 		<transition name="fade">
 			<div class="dropdown-menu" v-if="open">
 				<div class="dropdown-content">
@@ -15,46 +16,42 @@
 	</div>
 </template>
 
-<script lang="ts">
-import {defineComponent} from 'vue'
-import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
+<script setup lang="ts">
+import {ref} from 'vue'
+import {onClickOutside} from '@vueuse/core'
 
-export default defineComponent({
-	name: 'dropdown',
-	data() {
-		return {
-			open: false,
-		}
-	},
-	mounted() {
-		document.addEventListener('click', this.handleClickOutside)
-	},
-	beforeUnmount() {
-		document.removeEventListener('click', this.handleClickOutside)
-	},
-	props: {
-		triggerIcon: {
-			type: String,
-			default: 'ellipsis-h',
-		},
-	},
-	emits: ['close'],
-	methods: {
-		close() {
-			this.open = false
-		},
-		toggleOpen() {
-			this.open = !this.open
-		},
-		handleClickOutside(e) {
-			if (!this.open) {
-				return
-			}
-			closeWhenClickedOutside(e, this.$refs.dropdown, () => {
-				this.open = false
-				this.$emit('close', e)
-			})
-		},
+import BaseButton from '@/components/base/BaseButton.vue'
+
+defineProps({
+	triggerIcon: {
+		type: String,
+		default: 'ellipsis-h',
 	},
 })
+const emit = defineEmits(['close'])
+
+const open = ref(false)
+
+function close() {
+	open.value = false
+}
+
+function toggleOpen() {
+	open.value = !open.value
+}
+
+const dropdown = ref()
+onClickOutside(dropdown, (e: Event) => {
+	if (!open.value) {
+		return
+	}
+	close()
+	emit('close', e)
+})
 </script>
+
+<style lang="scss" scoped>
+.dropdown-menu  .dropdown-content {
+	box-shadow: var(--shadow-md);
+}
+</style>
\ No newline at end of file
diff --git a/src/styles/theme/theme.scss b/src/styles/theme/theme.scss
index 8087a2e19..403f6dea9 100644
--- a/src/styles/theme/theme.scss
+++ b/src/styles/theme/theme.scss
@@ -144,10 +144,6 @@ button.table {
   margin-right: 4px;
 }
 
-.dropdown-menu  .dropdown-content {
-	box-shadow: var(--shadow-md);
-}
-
 .is-strikethrough {
   text-decoration: line-through;
 }