diff --git a/frontend/src/components/CategoryForm.js b/frontend/src/components/CategoryForm.js
index 7441ddb..46df811 100644
--- a/frontend/src/components/CategoryForm.js
+++ b/frontend/src/components/CategoryForm.js
@@ -18,6 +18,8 @@ export default function NewCategoryDialog(props) {
   const dispatch = useDispatch()
   const categoryGroups = useSelector(categoryGroupsSelectors.selectAll)
 
+  console.log(props)
+
   /**
    * State block
    */
@@ -86,8 +88,10 @@ export default function NewCategoryDialog(props) {
               return
             }
 
+            const isSelected = group.id === props.categoryGroupId
+
             return (
-              <MenuItem value={group.id} key={group.id}>
+              <MenuItem value={group.id} key={group.id} selected={isSelected}>
                 {group.name}
               </MenuItem>
             )
diff --git a/frontend/src/components/Login.js b/frontend/src/components/Login.js
index 1ef9285..f02bb32 100644
--- a/frontend/src/components/Login.js
+++ b/frontend/src/components/Login.js
@@ -156,6 +156,13 @@ export default function Login() {
     await initUser()
   }
 
+  const onKeyPress = e => {
+    switch (e.key) {
+      case 'Enter':
+        return handleLogin()
+    }
+  }
+
   return (
     <div>
       <AlertDialog open={alertDialogOpen} body={alertDialogBody} handleClose={() => setAlertDialogOpen(false)} />
@@ -172,6 +179,7 @@ export default function Login() {
             fullWidth
             variant="standard"
             onChange={onEmailChange}
+            onKeyPress={onKeyPress}
           />
           <TextField
             margin="dense"
@@ -181,6 +189,7 @@ export default function Login() {
             fullWidth
             variant="standard"
             onChange={onPasswordChange}
+            onKeyPress={onKeyPress}
           />
         </DialogContent>
         <DialogActions>