diff --git a/desktop/src/App.vue b/desktop/src/App.vue
index 146e49c..7f5b15b 100644
--- a/desktop/src/App.vue
+++ b/desktop/src/App.vue
@@ -16,6 +16,7 @@ import SearchBar from './components/SearchBar.vue';
 import ThemeToggle from './components/ThemeToggle.vue';
 import SettingsPanel from './components/SettingsPanel.vue';
 import NotesHeader from './components/NotesHeader.vue';
+import { TAG_REGEX } from './utils/regex';
 
 // Configure marked options
 marked.setOptions({
@@ -118,8 +119,7 @@ const loadNotes = async () => {
 
 // Extract tags from note content (words starting with #)
 const extractTags = (content: string): string[] => {
-  const tagRegex = /#(\w+)/g;
-  const matches = content.matchAll(tagRegex);
+  const matches = content.matchAll(TAG_REGEX);
   return Array.from(matches, (m) => m[1].toLowerCase());
 };
 
@@ -155,6 +155,7 @@ const filteredNotes = computed(() => {
     filtered = filtered.filter((note) => {
       const tags = extractTags(note.content);
       // Check if note has ALL selected tags
+
       return selectedTags.value.every((selectedTag) =>
         tags.includes(selectedTag),
       );
diff --git a/desktop/src/components/TagsPanel.vue b/desktop/src/components/TagsPanel.vue
index 01024bc..62ea17a 100644
--- a/desktop/src/components/TagsPanel.vue
+++ b/desktop/src/components/TagsPanel.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import Tag from './Tag.vue';
+import { TAG_REGEX } from '../utils/regex';
 
 interface Note {
   id: number;
@@ -21,8 +22,7 @@ const emit = defineEmits<{
 
 // Extract tags from note content (words starting with #)
 const extractTags = (content: string): string[] => {
-  const tagRegex = /#(\w+)/g;
-  const matches = content.matchAll(tagRegex);
+  const matches = content.matchAll(TAG_REGEX);
   return Array.from(matches, (m) => m[1].toLowerCase());
 };
 
diff --git a/desktop/src/utils/regex.ts b/desktop/src/utils/regex.ts
new file mode 100644
index 0000000..b81fecd
--- /dev/null
+++ b/desktop/src/utils/regex.ts
@@ -0,0 +1 @@
+export const TAG_REGEX = /(?<=\s|^)#([\w+-]+)/g;