diff --git a/public/scripts/extensions/expressions/index.js b/public/scripts/extensions/expressions/index.js
index 338778579..26afd614f 100644
--- a/public/scripts/extensions/expressions/index.js
+++ b/public/scripts/extensions/expressions/index.js
@@ -1392,7 +1392,6 @@ async function drawSpritesList(character, labels, sprites) {
             continue;
         }
 
-        // TODO: Fix valid expression lists/caching and group them correctly
         validExpressions.push({ label: expression, files: images });
 
         // Render main = first file, additional = rest
@@ -2086,13 +2085,12 @@ async function onClickExpressionDelete(event) {
 
     const confirmation = await Popup.show.confirm(t`Delete Expression`, t`Are you sure you want to delete this expression? Once deleted, it\'s gone forever!`
         + '<br /><br />'
-        + t`Expression: `
-        + expressionListItem.attr('data-filename'));
+        + t`Expression:` + ' <tt>' + expressionListItem.attr('data-filename')) + '</tt>';
     if (!confirmation) {
         return;
     }
 
-    const fileName = expressionListItem.attr('data-filename');
+    const fileName = withoutExtension(expressionListItem.attr('data-filename'));
     const name = $('#image_list').data('name');
 
     try {