3 files changed, 4 insertions, 4 deletions
diff --git a/modern/src/settings/CommandSendPage.js b/modern/src/settings/CommandSendPage.js
index d853f995..4afc6992 100644
--- a/modern/src/settings/CommandSendPage.js
+++ b/modern/src/settings/CommandSendPage.js
@@ -101,7 +101,7 @@ const CommandSendPage = () => {
               label={t('sharedSavedCommand')}
             />
             {!limitCommands && !savedId && (
-              <BaseCommandView item={item} setItem={setItem} />
+              <BaseCommandView deviceId={deviceId} item={item} setItem={setItem} />
             )}
           </AccordionDetails>
         </Accordion>
diff --git a/modern/src/settings/components/BaseCommandView.js b/modern/src/settings/components/BaseCommandView.js
index ca81a854..1ba6a37c 100644
--- a/modern/src/settings/components/BaseCommandView.js
+++ b/modern/src/settings/components/BaseCommandView.js
@@ -7,7 +7,7 @@ import SelectField from '../../common/components/SelectField';
 import { prefixString } from '../../common/util/stringUtils';
 import useCommandAttributes from '../../common/attributes/useCommandAttributes';
 
-const BaseCommandView = ({ item, setItem }) => {
+const BaseCommandView = ({ deviceId, item, setItem }) => {
   const t = useTranslation();
 
   const availableAttributes = useCommandAttributes(t);
@@ -27,7 +27,7 @@ const BaseCommandView = ({ item, setItem }) => {
       <SelectField
         value={item.type || ''}
         onChange={(e) => setItem({ ...item, type: e.target.value, attributes: {} })}
-        endpoint="/api/commands/types"
+        endpoint={deviceId ? `/api/commands/types?${new URLSearchParams({ deviceId }).toString()}` : '/api/commands/types'}
         keyGetter={(it) => it.type}
         titleGetter={(it) => t(prefixString('command', it.type))}
         label={t('sharedType')}
diff --git a/modern/src/settings/components/SettingsMenu.js b/modern/src/settings/components/SettingsMenu.js
index c6aac4b5..c732fc9f 100644
--- a/modern/src/settings/components/SettingsMenu.js
+++ b/modern/src/settings/components/SettingsMenu.js
@@ -123,7 +123,7 @@ const SettingsMenu = () => {
               title={t('sharedSavedCommands')}
               link="/settings/commands"
               icon={<PublishIcon />}
-              selected={location.pathname.startsWith('/settings/command')}
+              selected={location.pathname.startsWith('/settings/command') && !location.pathname.startsWith('/settings/command-send')}
             />
           </>
         )}