diff --git a/client/app.js b/client/app.js
index dac7379..2bb5f29 100644
--- a/client/app.js
+++ b/client/app.js
@@ -1,4 +1,8 @@
-import { controlButtonHandler, keyboardHandler, settingsHandler } from './src/handlers.js'
+import {
+	controlButtonHandler,
+	keyboardHandler,
+	settingsHandler,
+} from './src/handlers.js'
 import { assignCommands } from './src/utils.js'
 
 // Input handlers
@@ -25,3 +29,11 @@ document.addEventListener('keydown', keyboardHandler)
 
 // Settings handler
 document.querySelector('#settings').addEventListener('submit', settingsHandler)
+
+// Restore endpoint if available
+const endpoint = sessionStorage.getItem('robot-endpoint')
+if (endpoint) {
+	document.querySelector('input[name=ip-address]').value = new URL(
+		endpoint
+	).host
+}