diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm
index e2f0e7f8c16..86ae8d0398b 100644
--- a/code/modules/admin/modify_robot.dm
+++ b/code/modules/admin/modify_robot.dm
@@ -64,6 +64,6 @@
 			target.crisis_override = !target.crisis_override
 			return TRUE
 		if("add_restriction")
-			target.restrict_modules_to += robot_modules[params["new_restriction"]]
+			target.restrict_modules_to += params["new_restriction"]
 		if("remove_restriction")
-			target.restrict_modules_to -= robot_modules[params["rem_restriction"]]
+			target.restrict_modules_to -= params["rem_restriction"]
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotNoModule.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotNoModule.tsx
new file mode 100644
index 00000000000..ad12e842f6e
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotNoModule.tsx
@@ -0,0 +1,84 @@
+import { useBackend } from '../../backend';
+import {
+  Button,
+  Divider,
+  Flex,
+  NoticeBox,
+  Section,
+  Stack,
+} from '../../components';
+import { Target } from './types';
+
+export const ModifyTobotNoModule = (props: { target: Target }) => {
+  const { target } = props;
+  const { act } = useBackend();
+
+  return (
+    <>
+      <NoticeBox warning>
+        Target has no active module. Limited options available.
+      </NoticeBox>
+      <Divider />
+      <Button
+        fluid
+        color={target.crisis_override ? 'red' : 'green'}
+        onClick={() => act('toggle_crisis')}
+      >
+        {(target.crisis_override ? 'Disable' : 'Enable') + ' Crisis Override'}
+      </Button>
+      <Divider />
+      <Flex>
+        <Flex.Item grow />
+        <Flex.Item shrink>
+          <Section title="Active Restrictions">
+            <Stack fill>
+              <Stack.Item fillPositionedParent>
+                {target.active_restrictions.map((active_restriction, i) => {
+                  return (
+                    <Button
+                      fluid
+                      color="red"
+                      key={i}
+                      onClick={() =>
+                        act('remove_restriction', {
+                          rem_restriction: active_restriction,
+                        })
+                      }
+                    >
+                      {active_restriction}
+                    </Button>
+                  );
+                })}
+              </Stack.Item>
+            </Stack>
+          </Section>
+        </Flex.Item>
+        <Flex.Item shrink>
+          <Section title="Possible Restrictions">
+            <Stack fill>
+              <Stack.Item fillPositionedParent>
+                {target.possible_restrictions.map((possible_restriction, i) => {
+                  return (
+                    <Button
+                      fluid
+                      color="green"
+                      key={i}
+                      onClick={() =>
+                        act('add_restriction', {
+                          new_restriction: possible_restriction,
+                        })
+                      }
+                    >
+                      {possible_restriction}
+                    </Button>
+                  );
+                })}
+              </Stack.Item>
+            </Stack>
+          </Section>
+        </Flex.Item>
+        <Flex.Item grow />
+      </Flex>
+    </>
+  );
+};
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
index 842191bde3e..94aa2ed9d3c 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
@@ -3,16 +3,14 @@ import { useState } from 'react';
 import { useBackend } from '../../backend';
 import {
   Box,
-  Button,
   Divider,
   Dropdown,
-  Flex,
+  LabeledList,
   NoticeBox,
-  Section,
-  Stack,
   Tabs,
 } from '../../components';
 import { Window } from '../../layouts';
+import { ModifyTobotNoModule } from './ModifyRobotNoModule';
 import { Data } from './types';
 
 export const ModifyRobot = (props) => {
@@ -36,91 +34,28 @@ export const ModifyRobot = (props) => {
       <Window.Content scrollable>
         {target ? (
           <NoticeBox info>
-            {target.name} played by {target.ckey}.
+            {target.name}
+            {!!target.ckey && ' played by ' + target.ckey}.
           </NoticeBox>
         ) : (
           <NoticeBox danger>No target selected. Please pick one.</NoticeBox>
         )}
-        <Dropdown
-          selected={target ? target.name : ''}
-          options={all_players}
-          onSelected={(value) =>
-            act('select_target', {
-              new_target: value,
-            })
-          }
-        />
+        <LabeledList>
+          <LabeledList.Item label="Player Selection">
+            <Dropdown
+              selected={target ? target.name : ''}
+              options={all_players}
+              onSelected={(value) =>
+                act('select_target', {
+                  new_target: value,
+                })
+              }
+            />
+          </LabeledList.Item>
+        </LabeledList>
+        <Divider />
         {target && !target.module ? (
-          <>
-            <NoticeBox warning>
-              Target has no active module. Limited options available.
-            </NoticeBox>
-            <Button
-              fluid
-              color={target.crisis_override ? 'red' : 'green'}
-              onClick={() => act('toggle_crisis')}
-            >
-              {(target.crisis_override ? 'Disable' : 'Enable') +
-                ' Crisis Override'}
-            </Button>
-            <Divider />
-            <Flex>
-              <Flex.Item grow />
-              <Flex.Item shrink>
-                <Section title="Active Restrictions">
-                  <Stack>
-                    <Stack.Item>
-                      {target.active_restrictions.map(
-                        (active_restriction, i) => {
-                          return (
-                            <Button
-                              fluid
-                              color="red"
-                              key={i}
-                              onClick={() =>
-                                act('remove_restriction', {
-                                  rem_restriction: active_restriction,
-                                })
-                              }
-                            >
-                              {active_restriction}
-                            </Button>
-                          );
-                        },
-                      )}
-                    </Stack.Item>
-                  </Stack>
-                </Section>
-              </Flex.Item>
-              <Flex.Item shrink>
-                <Section title="Possible Restrictions">
-                  <Stack>
-                    <Stack.Item>
-                      {target.possible_restrictions.map(
-                        (possible_restriction, i) => {
-                          return (
-                            <Button
-                              fluid
-                              color="green"
-                              key={i}
-                              onClick={() =>
-                                act('add_restriction', {
-                                  new_restriction: possible_restriction,
-                                })
-                              }
-                            >
-                              {possible_restriction}
-                            </Button>
-                          );
-                        },
-                      )}
-                    </Stack.Item>
-                  </Stack>
-                </Section>
-              </Flex.Item>
-              <Flex.Item grow />
-            </Flex>
-          </>
+          <ModifyTobotNoModule target={target} />
         ) : (
           <>
             <Tabs>
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/types.ts b/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
index e2e4097f109..9e4b3d57a37 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
@@ -1,17 +1,7 @@
 import { BooleanLike } from 'common/react';
 
 export type Data = {
-  target: {
-    name: string;
-    ckey: string;
-    module: string;
-    crisis_override: BooleanLike;
-    active_restrictions: string[];
-    possible_restrictions: string[];
-    front: string | null;
-    side: string | null;
-    back: string | null;
-  } | null;
+  target: Target | null;
   all_players: DropdownEntry[];
 };
 
@@ -19,3 +9,15 @@ export type DropdownEntry = {
   displayText: string;
   value: string;
 };
+
+export type Target = {
+  name: string;
+  ckey: string;
+  module: string;
+  crisis_override: BooleanLike;
+  active_restrictions: string[];
+  possible_restrictions: string[];
+  front: string | null;
+  side: string | null;
+  back: string | null;
+};