diff --git a/Dockerfile b/Dockerfile
index d00b278..0a66bf8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,6 +22,7 @@ RUN cd /app && git clone https://github.com/novnc/noVNC.git && \
     cd /app/noVNC/utils && git clone https://github.com/kanaka/websockify websockify && \
     mkdir /data && mkdir /app/.config && ln -s /data /app/.config/Wohnungsbot
 ADD startup.sh /app/startup.sh
+ADD openbox/* /app/.config/openbox/
 COPY --from=builder /root/wohnungsbot/release/Wohnungsbot-$WB_VERSION.AppImage /app/Wohnungsbot.AppImage
 RUN chmod 0755 /app/startup.sh && chown -R bot /app && chown -R bot /data
 
diff --git a/README.md b/README.md
index 8d94762..f7cd5d9 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,8 @@ docker run -td -p 6080:6080 wohnungsbot
 
 The interface is then available under http://privateip:6080
 
+If the bot gets stuck, press ESC to restart it.
+
 ### Advanced use case
 
 You can build a specific tag of [Wohnungsbot](https://github.com/neopostmodern/wohnungsbot) by using the following syntax. The data is generally automatically persisted in a docker volume, but that volume can also be named.
diff --git a/openbox/autostart b/openbox/autostart
new file mode 100644
index 0000000..b35e53d
--- /dev/null
+++ b/openbox/autostart
@@ -0,0 +1,2 @@
+# Programs that will run after Openbox has started
+~/Wohnungsbot.AppImage --appimage-extract-and-run --no-sandbox
\ No newline at end of file
diff --git a/openbox/rc.xml b/openbox/rc.xml
new file mode 100644
index 0000000..178edae
--- /dev/null
+++ b/openbox/rc.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openbox_config xmlns="http://openbox.org/3.4/rc" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <resistance>
+    <strength>10</strength>
+    <screen_edge_strength>20</screen_edge_strength>
+  </resistance>
+  <focus>
+    <focusNew>yes</focusNew>
+    <followMouse>no</followMouse>
+    <focusLast>yes</focusLast>
+    <underMouse>no</underMouse>
+    <focusDelay>200</focusDelay>
+    <raiseOnFocus>no</raiseOnFocus>
+  </focus>
+  <placement>
+    <policy>Smart</policy>
+    <center>yes</center>
+    <monitor>Primary</monitor>
+    <primaryMonitor>1</primaryMonitor>
+  </placement>
+  <theme>
+    <name>Clearlooks</name>
+    <titleLayout>NLC</titleLayout>
+    <keepBorder>no</keepBorder>
+    <animateIconify>no</animateIconify>
+    <font place="ActiveWindow">
+      <name>sans</name>
+      <size>8</size>
+      <weight>bold</weight>
+      <slant>normal</slant>
+    </font>
+    <font place="InactiveWindow">
+      <name>sans</name>
+      <size>8</size>
+      <weight>bold</weight>
+      <slant>normal</slant>
+    </font>
+    <font place="MenuHeader">
+      <name>sans</name>
+      <size>9</size>
+      <weight>normal</weight>
+      <slant>normal</slant>
+    </font>
+    <font place="MenuItem">
+      <name>sans</name>
+      <size>9</size>
+      <weight>normal</weight>
+      <slant>normal</slant>
+    </font>
+    <font place="ActiveOnScreenDisplay">
+      <name>sans</name>
+      <size>9</size>
+      <weight>bold</weight>
+      <slant>normal</slant>
+    </font>
+    <font place="InactiveOnScreenDisplay">
+      <name>sans</name>
+      <size>9</size>
+      <weight>bold</weight>
+      <slant>normal</slant>
+    </font>
+  </theme>
+  <desktops>
+    <number>1</number>
+    <firstdesk>1</firstdesk>
+    <names>
+      <name>main</name>
+    </names>
+    <popupTime>0</popupTime>
+  </desktops>
+  <resize>
+    <drawContents>yes</drawContents>
+    <popupShow>Nonpixel</popupShow>
+    <popupPosition>Center</popupPosition>
+    <popupFixedPosition>
+      <x>10</x>
+      <y>10</y>
+    </popupFixedPosition>
+  </resize>
+  <margins>
+    <top>0</top>
+    <bottom>0</bottom>
+    <left>0</left>
+    <right>0</right>
+  </margins>
+  <dock>
+    <position>TopLeft</position>
+    <floatingX>0</floatingX>
+    <floatingY>0</floatingY>
+    <noStrut>no</noStrut>
+    <stacking>Above</stacking>
+    <direction>Vertical</direction>
+    <autoHide>no</autoHide>
+    <hideDelay>300</hideDelay>
+    <showDelay>300</showDelay>
+    <moveButton>Middle</moveButton>
+  </dock>
+  <keyboard>
+    <chainQuitKey>C-g</chainQuitKey>
+    <!-- Keybindings for windows -->
+    <keybind key="Escape">
+      <action name="If">
+        <query>
+          <title>Wohnungsbot</title>
+        </query>
+        <then>
+          <action name="Close"/>
+          <action name="Execute">
+            <command>/app/Wohnungsbot.AppImage --appimage-extract-and-run --no-sandbox</command>
+          </action>
+        </then>
+        <else>
+          <action name="Execute">
+            <command>/app/Wohnungsbot.AppImage --appimage-extract-and-run --no-sandbox</command>
+          </action>
+        </else>
+      </action>
+    </keybind>
+  </keyboard>
+  <mouse>
+    <dragThreshold>1</dragThreshold>
+    <doubleClickTime>500</doubleClickTime>
+    <screenEdgeWarpTime>0</screenEdgeWarpTime>
+    <screenEdgeWarpMouse>false</screenEdgeWarpMouse>
+  </mouse>
+  <menu>
+    <hideDelay>200</hideDelay>
+    <middle>no</middle>
+    <submenuShowDelay>100</submenuShowDelay>
+    <submenuHideDelay>400</submenuHideDelay>
+    <showIcons>yes</showIcons>
+    <manageDesktops>no</manageDesktops>
+  </menu>
+  <applications>
+    <application class="*">
+      <fullscreen>yes</fullscreen>
+      <decor>no</decor>
+    </application>
+  </applications>
+</openbox_config>
\ No newline at end of file
diff --git a/startup.sh b/startup.sh
index ea99e3e..48828ad 100644
--- a/startup.sh
+++ b/startup.sh
@@ -3,10 +3,5 @@ export DISPLAY=:1
 Xvfb :1 -screen 0 1600x900x16 &
 sleep 5
 openbox-session&
-x11vnc -display :1 -nopw -listen localhost -xkb -ncache 10 -ncache_cr -forever &
-cd /app/noVNC && ln -s vnc_lite.html index.html && ./utils/novnc_proxy --vnc localhost:5900 &
-
-while true
-do
-  /app/Wohnungsbot.AppImage --appimage-extract-and-run --no-sandbox
-done
\ No newline at end of file
+x11vnc -display :1 -nopw -listen localhost -xkb -forever &
+cd /app/noVNC && ln -s vnc_lite.html index.html && ./utils/novnc_proxy --vnc localhost:5900
\ No newline at end of file