diff --git a/src/commands/view/ShowOffset.ts b/src/commands/view/ShowOffset.ts
index 7e9c1cfa7..e8c0a588c 100644
--- a/src/commands/view/ShowOffset.ts
+++ b/src/commands/view/ShowOffset.ts
@@ -1,7 +1,6 @@
 import { isUndefined } from 'underscore';
 import { CanvasSpotBuiltInTypes } from '../../canvas/model/CanvasSpot';
 import { $ } from '../../common';
-import { isTextNode } from '../../utils/dom';
 import { CommandObject } from './CommandAbstract';
 
 export default {
@@ -18,11 +17,7 @@ export default {
     const zoom = this.em.getZoomDecimal();
     const el = opt.el as HTMLElement | undefined;
 
-    if (!(el instanceof HTMLElement)) {
-      return;
-    }
-
-    if (!config.showOffsets || !el || isTextNode(el) || (!config.showOffsetsSelected && state == 'Fixed')) {
+    if (!config.showOffsets || !(el instanceof HTMLElement) || (!config.showOffsetsSelected && state == 'Fixed')) {
       editor.stopCommand(`${this.id}`, opts);
       return;
     }
diff --git a/src/selector_manager/model/Selector.ts b/src/selector_manager/model/Selector.ts
index 9da1d71dd..afc6f243d 100644
--- a/src/selector_manager/model/Selector.ts
+++ b/src/selector_manager/model/Selector.ts
@@ -191,7 +191,7 @@ export default class Selector extends Model<SelectorProps & { [key: string]: unk
    * @private
    */
   static escapeName(name: string) {
-    return `${name}`.trim().replace(/([^a-z0-9\w\-\\:@\\/()\.%\+\[\]]+)/gi, '-');
+    return `${name}`.trim().replace(/([^a-z0-9\w\-\\:@\\/#()\.%\+\[\]]+)/gi, '-');
   }
 }
 
diff --git a/test/specs/selector_manager/model/SelectorModels.ts b/test/specs/selector_manager/model/SelectorModels.ts
index 5a319fdf0..9a77cc96d 100644
--- a/test/specs/selector_manager/model/SelectorModels.ts
+++ b/test/specs/selector_manager/model/SelectorModels.ts
@@ -3,8 +3,8 @@ import Selectors from '../../../../src/selector_manager/model/Selectors';
 
 describe('Selector', () => {
   let obj: Selector;
-  const nameToEscape = '@Te s:T*';
-  const nameEscaped = '@Te-s:T-';
+  const nameToEscape = '@Te sT:*[]().%/+#';
+  const nameEscaped = '@Te-sT:-[]().%/+#';
 
   beforeEach(() => {
     obj = new Selector({});