diff --git a/src/Tasks/TaskEdit.tsx b/src/Tasks/TaskEdit.tsx
index 0375a64..32d1953 100644
--- a/src/Tasks/TaskEdit.tsx
+++ b/src/Tasks/TaskEdit.tsx
@@ -80,7 +80,7 @@ export default class TaskEdit extends React.PureComponent<PropsType> {
   constructor(props: PropsType) {
     super(props);
     this.state = {
-      parentEntry: "",
+      parentEntry: props.item?.relatedTo ?? "",
       uid: "",
       title: "",
       status: TaskStatusType.NeedsAction,
@@ -552,8 +552,8 @@ export default class TaskEdit extends React.PureComponent<PropsType> {
           entries={this.filterChildren()}
           orig={this.state.parentEntry}
           open={this.state.showSelectorDialog}
-          onConfirm={(entry) => console.log(entry)}
-          onCancel={() => this.setState({ openSelector: false })}
+          onConfirm={(entry) => this.setState({ showSelectorDialog: false, parentEntry: entry })}
+          onCancel={() => this.setState({ showSelectorDialog: false })}
         />
       </React.Fragment>
     );
diff --git a/src/Tasks/TaskSelector.tsx b/src/Tasks/TaskSelector.tsx
index bd002b6..12b2ad3 100644
--- a/src/Tasks/TaskSelector.tsx
+++ b/src/Tasks/TaskSelector.tsx
@@ -1,4 +1,3 @@
-import { useState } from "react";
 import { TaskType } from "../pim-types";
 import { Button, Dialog, DialogActions, DialogContent, DialogTitle, List } from "@material-ui/core";
 import React from "react";
@@ -13,13 +12,6 @@ interface PropsType {
 }
 
 export default function TaskSelector(props: PropsType) {
-  const [itemId, setItemId] = useState<string | null>(props.orig);
-
-  const select = () => {
-    if (itemId) {
-      props.onConfirm(itemId);
-    }
-  };
 
   const itemList = props.entries.filter((e) => !e.relatedTo)
     .map((e) => 
@@ -27,8 +19,7 @@ export default function TaskSelector(props: PropsType) {
         key={e.uid}
         entries={props.entries}
         thisEntry={e}
-        onClick={setItemId}
-        selected={itemId}
+        onClick={props.onConfirm}
       />
     );
 
@@ -43,15 +34,9 @@ export default function TaskSelector(props: PropsType) {
         </List>
       </DialogContent>
       <DialogActions>
-        <Button color="primary" onClick={props.onCancel}>
-          Cancel
-        </Button>
         <Button color="primary" onClick={() => props.onConfirm(null)}>
           Clear
         </Button>
-        <Button color="primary" onClick={select}>
-          Select
-        </Button>
       </DialogActions>
     </Dialog>
   );
diff --git a/src/Tasks/TaskSelectorListItem.tsx b/src/Tasks/TaskSelectorListItem.tsx
index d755732..343272f 100644
--- a/src/Tasks/TaskSelectorListItem.tsx
+++ b/src/Tasks/TaskSelectorListItem.tsx
@@ -5,7 +5,6 @@ import React from "react";
 interface PropsType {
   entries: TaskType[];
   onClick: (uid: string) => void;
-  selected: string | null;
   thisEntry: TaskType;
 }
 
@@ -15,7 +14,6 @@ export default function TaskSelectorListItem(props: PropsType) {
   return (
     <ListItem
       primaryText={props.thisEntry.title}
-      selected={props.selected === props.thisEntry.uid}
       key={props.thisEntry.uid}
       onClick={() => props.onClick(props.thisEntry.uid)}
       nestedItems={tasks.map((e) => 
@@ -23,7 +21,6 @@ export default function TaskSelectorListItem(props: PropsType) {
           key={e.uid}
           entries={props.entries}
           onClick={props.onClick}
-          selected={props.selected}
           thisEntry={e}
         />
       )}