diff --git a/common/changes/@stonecrop/node-editor/168_edge_connections_2024-10-22-01-17.json b/common/changes/@stonecrop/node-editor/168_edge_connections_2024-10-22-01-17.json
new file mode 100644
index 00000000..ad91f918
--- /dev/null
+++ b/common/changes/@stonecrop/node-editor/168_edge_connections_2024-10-22-01-17.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@stonecrop/node-editor",
+      "comment": "Add handling for edge creation and removal.",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@stonecrop/node-editor"
+}
\ No newline at end of file
diff --git a/node_editor/src/components/EditableEdge.vue b/node_editor/src/components/EditableEdge.vue
index a8ad7d29..f9a7e231 100644
--- a/node_editor/src/components/EditableEdge.vue
+++ b/node_editor/src/components/EditableEdge.vue
@@ -87,5 +87,6 @@ export default {
 
 .label-input {
 	text-align: center;
+	width: 40ch;
 }
 </style>
diff --git a/node_editor/src/components/NodeEditor.vue b/node_editor/src/components/NodeEditor.vue
index 1a867df8..e909bbc2 100644
--- a/node_editor/src/components/NodeEditor.vue
+++ b/node_editor/src/components/NodeEditor.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script setup lang="ts">
-import { type VueFlowStore, Position, VueFlow, useVueFlow, Node } from '@vue-flow/core'
+import { type VueFlowStore, Position, VueFlow, useVueFlow, Connection, Node } from '@vue-flow/core'
 import { type HTMLAttributes, ref, computed, defineEmits, onBeforeUnmount, onMounted } from 'vue'
 
 import EditableEdge from '@/components/EditableEdge.vue'
@@ -103,6 +103,7 @@ const elements = computed({
 		emit('update:modelValue', JSON.parse(JSON.stringify(newValue)))
 	},
 })
+const { onConnect, addEdges, onEdgeContextMenu, onPaneReady, removeEdges } = useVueFlow()
 
 onMounted(() => {
 	document.removeEventListener('keypress', handleKeypress)
@@ -113,7 +114,6 @@ onBeforeUnmount(() => {
 	document.removeEventListener('keypress', handleKeypress)
 })
 
-const { onPaneReady } = useVueFlow()
 onPaneReady(instance => {
 	vueFlowInstance.value = instance
 })
@@ -222,6 +222,35 @@ const labelChanged = (e, id) => {
 		}
 	}
 }
+
+const handleConnect = (connection: Connection) => {
+	const id = vueFlowElements.value.length
+	const newEdge = {
+		id: `edge-${id}`,
+		source: connection.source,
+		target: connection.target,
+		type: 'editable',
+		label: `New Edge`,
+		interactionWidth: 400,
+		animated: true,
+		events: {
+			click: () => {
+				activeElementKey.value = newEdge.id
+			},
+		},
+	}
+	addEdges([newEdge])
+}
+
+onConnect(handleConnect)
+
+const handleEdgeRemove = edgeId => {
+	removeEdges(edgeId)
+}
+
+onEdgeContextMenu(({ event, edge }) => {
+	handleEdgeRemove(edge.id)
+})
 </script>
 
 <style>
diff --git a/node_editor/src/components/StateEditor.vue b/node_editor/src/components/StateEditor.vue
index ba7c9575..da868f6f 100644
--- a/node_editor/src/components/StateEditor.vue
+++ b/node_editor/src/components/StateEditor.vue
@@ -40,31 +40,28 @@ const elements = computed<FlowElements>({
 			}
 
 			stateHash[key] = el
+		}
 
+		for (const [key, value] of Object.entries(states.value)) {
 			if (value.on) {
 				for (const [edgeKey, edgeValue] of Object.entries(value.on)) {
-					if (Array.isArray(edgeValue)) {
-						for (const edge of edgeValue) {
-							// TODO: handle typescript errors for both types of states
-							// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-							const edgeJson = edge.toJSON()
-							// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-							const target = edgeJson.target.toString()
-							stateElements.push({
-								id: `${key}-${edgeKey}`,
-								target: target,
-								source: key,
-								label: edgeKey,
-								animated: true,
-							})
-
-							// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-							hasInputs[target] = true
-						}
-					}
+					// If the proxy array 'value.on' has more than one edge, 'edgeValue' will contain a proxy object
+					// where 'target' can be accessed. Otherwise, 'edgeValue' will be available directly.
+					const target = edgeValue.target || edgeValue
+					// TODO: handle typescript errors for both types of states
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+					stateElements.push({
+						id: `${key}-${target}`,
+						source: key,
+						target: target,
+						label: edgeKey,
+						animated: true,
+					})
+
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+					hasInputs[target] = true
 				}
 			}
-
 			index++
 		}
 
@@ -78,6 +75,7 @@ const elements = computed<FlowElements>({
 
 		return stateElements
 	},
+
 	set: newValue => {
 		// update modelValue when elements change
 		onElementsChange(newValue)
@@ -85,7 +83,6 @@ const elements = computed<FlowElements>({
 		// TODO: emit('update:modelValue', modelValue)
 	},
 })
-
 const onElementsChange = (elements: FlowElements) => {
 	const edges: Record<string, Record<string, any>> = {}
 	const idToLabel: Record<string, string> = {}
@@ -104,19 +101,18 @@ const onElementsChange = (elements: FlowElements) => {
 			states[label] = {
 				type: 'final',
 			}
-		} /* else if (el.source && el.target) {
+		} else if (el.source && el.target) {
 			// it's an edge
 			edges[el.source] = edges[el.source] || {}
 			edges[el.source][label] = {
 				target: el.target,
 			}
-		} */ else {
+		} else {
 			// it's a state
 			states[label] = {
 				on: {},
 			}
 		}
-
 		idToLabel[el.id] = label
 	}