diff --git a/controller/lib/systemd.py b/controller/lib/systemd.py
index 28a6f700..37ee2f09 100644
--- a/controller/lib/systemd.py
+++ b/controller/lib/systemd.py
@@ -226,6 +226,26 @@ def restart_service(name: str) -> dict:
         return {"success": False, "error": f"Unknown service: {name}"}
 
     systemd_name = service_config.get("systemd_name", name)
+
+    # Special handling for self-restart: use Popen to avoid blocking
+    # (the process will be killed before subprocess.run can return)
+    if systemd_name == "wrolpi-controller":
+        try:
+            subprocess.Popen(["systemctl", "restart", systemd_name])
+            return {
+                "success": True,
+                "service": name,
+                "action": "restart",
+                "pending": True,
+            }
+        except Exception as e:
+            return {
+                "success": False,
+                "service": name,
+                "action": "restart",
+                "error": str(e),
+            }
+
     result = _run_systemctl("restart", systemd_name)
 
     return {
diff --git a/controller/templates/index.html b/controller/templates/index.html
index 30a79a1f..4553deb3 100644
--- a/controller/templates/index.html
+++ b/controller/templates/index.html
@@ -730,7 +730,7 @@
 
 <!-- Logs Modal -->
 <div id="logs-modal" class="modal" onclick="if(event.target===this)closeLogsModal()">
-    <div class="modal-content" style="width: 80%; max-width: none;">
+    <div class="modal-content" style="width: 90%; max-width: none;">
         <div class="modal-header">
             <h3 id="logs-title">Service Logs</h3>
             <button class="modal-close" onclick="closeLogsModal()">&times;</button>
diff --git a/controller/test/test_systemd.py b/controller/test/test_systemd.py
index 4fd1477f..95eaf959 100644
--- a/controller/test/test_systemd.py
+++ b/controller/test/test_systemd.py
@@ -219,6 +219,26 @@ class TestServiceActions:
             assert result["action"] == expected_action
 
 
+class TestControllerSelfRestart:
+    """Tests for controller self-restart behavior."""
+
+    def test_controller_restart_uses_popen(self):
+        """Controller restart should use Popen to avoid blocking on self-termination."""
+        with mock.patch("subprocess.Popen") as mock_popen:
+            result = restart_service("wrolpi-controller")
+            mock_popen.assert_called_once_with(["systemctl", "restart", "wrolpi-controller"])
+            assert result["success"] is True
+            assert result["pending"] is True
+            assert result["action"] == "restart"
+
+    def test_controller_restart_handles_exception(self):
+        """Controller restart should handle exceptions gracefully."""
+        with mock.patch("subprocess.Popen", side_effect=Exception("popen failed")):
+            result = restart_service("wrolpi-controller")
+            assert result["success"] is False
+            assert "popen failed" in result["error"]
+
+
 class TestGetServiceLogs:
     """Tests for get_service_logs function."""
 
diff --git a/docker-compose.yml b/docker-compose.yml
index d75d87ca..6a55f197 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,6 @@ services:
     build:
       context: .
       dockerfile: docker/controller/Dockerfile
-    container_name: wrolpi-controller
     restart: unless-stopped
     ports:
       - "8087:8087"