diff --git a/public/libs/workspaces.js b/public/libs/workspaces.js
index fb9825f1..102dc848 100644
--- a/public/libs/workspaces.js
+++ b/public/libs/workspaces.js
@@ -129,7 +129,10 @@ const setWorkspacePicture = (id, sourcePicturePath) => {
         pictureId,
         picturePath: destPicturePath,
       });
-      return fsExtra.remove(currentPicturePath);
+      if (currentPicturePath) {
+        return fsExtra.remove(currentPicturePath);
+      }
+      return null;
     })
     .catch(console.log);
 };
diff --git a/src/components/main/workspace-selector.js b/src/components/main/workspace-selector.js
index 632b4b89..a712651f 100644
--- a/src/components/main/workspace-selector.js
+++ b/src/components/main/workspace-selector.js
@@ -102,7 +102,9 @@ const WorkspaceSelector = ({
         {badgeCount > 9 ? '*' : badgeCount}
       </div>
     )}
-    <p className={classes.shortcutText}>{id === 'add' ? 'Add' : `⌘ + ${order + 1}`}</p>
+    {(id === 'add' || order < 9) && (
+      <p className={classes.shortcutText}>{id === 'add' ? 'Add' : `⌘ + ${order + 1}`}</p>
+    )}
   </div>
 );