diff --git a/fw-prompt/fw-prompt.go b/fw-prompt/fw-prompt.go
index 8db4389..c022b2e 100644
--- a/fw-prompt/fw-prompt.go
+++ b/fw-prompt/fw-prompt.go
@@ -1107,6 +1107,10 @@ func buttonAction(action string) {
 }
 
 func main() {
+	if len(os.Args) == 3 && os.Args[1] == "-display" {
+		os.Setenv("DISPLAY", os.Args[2])
+	}
+
 	_, err := newDbusServer()
 	if err != nil {
 		log.Fatal("Error:", err)
diff --git a/sources/usr/share/dbus-1/system-services/com.subgraph.FirewallPrompt.service b/sources/usr/share/dbus-1/system-services/com.subgraph.FirewallPrompt.service
new file mode 100644
index 0000000..8a71e40
--- /dev/null
+++ b/sources/usr/share/dbus-1/system-services/com.subgraph.FirewallPrompt.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=com.subgraph.FirewallPrompt
+Exec=/usr/bin/fw-prompt -display :0
+User=user