diff --git a/app/templates/_workspace_tree_macro.html b/app/templates/_workspace_tree_macro.html
index 59e81dc..3fdc1c3 100644
--- a/app/templates/_workspace_tree_macro.html
+++ b/app/templates/_workspace_tree_macro.html
@@ -1,9 +1,11 @@
 {% macro render_workspace_tree(pages, depth=0) %}
   {% for page in pages %}
+  {% set safe_name = page.name | replace("'", "'") %}
   <li class="sidebar-item ws-tree-item" 
       data-id="{{ page.db_id }}" 
       data-is-folder="{{ 'true' if page.is_folder else 'false' }}"
       data-depth="{{ depth }}"
+      data-name="{{ safe_name }}"
       :class="{ active: activeNodeId === {{ page.db_id }} }"
       draggable="true"
       @dragstart="dragStart($event, {{ page.db_id }})"
@@ -11,9 +13,9 @@
       @dragleave="dragLeave($event)"
       @drop.prevent="drop($event, {{ page.db_id }})"
       style="padding-left:{{ 4 + depth * 12 }}px;"
-      @contextmenu.prevent="showWsContext($event, {{ page.db_id }}, '{{ page.name | e }}', {{ 'true' if page.is_folder else 'false' }})"
+      @contextmenu.prevent="showWsContext($event, {{ page.db_id }}, '{{ safe_name }}', {{ 'true' if page.is_folder else 'false' }})"
       @touchstart="wsTouchStart($event)"
-      @touchend="wsTouchEnd($event, {{ page.db_id }}, '{{ page.name | e }}', {{ 'true' if page.is_folder else 'false' }})"
+      @touchend="wsTouchEnd($event, {{ page.db_id }}, '{{ safe_name }}', {{ 'true' if page.is_folder else 'false' }})"
       @touchmove="wsTouchMove($event)">
     {% if page.is_folder %}
     <button class="tree-chevron"