diff --git a/system_monitor_overlay/server.py b/system_monitor_overlay/server.py
index e4b176e..6fe5c30 100644
--- a/system_monitor_overlay/server.py
+++ b/system_monitor_overlay/server.py
@@ -22,4 +22,8 @@ class SystemInfoHandler(http.server.SimpleHTTPRequestHandler):
 
 with socketserver.TCPServer(('', PORT), SystemInfoHandler) as httpd:
     print("serving at port", PORT)
+    try:
     httpd.serve_forever()
+except KeyboardInterrupt:
+    print("\nShutting down server.")
+    httpd.shutdown()