diff --git a/src/components/App.tsx b/src/components/App.tsx
index 0ff5c18d5d..28b4e18257 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -1919,6 +1919,10 @@ class App extends React.Component<AppProps, AppState> {
         this.setState({
           draggingElement: null,
           editingElement: null,
+          selectedElementIds: {
+            ...this.state.selectedElementIds,
+            [element.id]: true,
+          },
         });
         if (this.state.elementLocked) {
           setCursorForShape(this.canvas, this.state.elementType);
diff --git a/src/element/textWysiwyg.tsx b/src/element/textWysiwyg.tsx
index 6eee0d3861..02e6618eb8 100644
--- a/src/element/textWysiwyg.tsx
+++ b/src/element/textWysiwyg.tsx
@@ -319,7 +319,9 @@ export const textWysiwyg = ({
 
   // prevent blur when changing properties from the menu
   const onPointerDown = (event: MouseEvent) => {
-    if (
+    if (event.target instanceof HTMLSelectElement) {
+      handleSubmit();
+    } else if (
       (event.target instanceof HTMLElement ||
         event.target instanceof SVGElement) &&
       event.target.closest(`.${CLASSES.SHAPE_ACTIONS_MENU}`) &&