diff --git a/app/controllers/projects/webhooks_controller.rb b/app/controllers/projects/webhooks_controller.rb
index 2152e96d7..c73f43c89 100644
--- a/app/controllers/projects/webhooks_controller.rb
+++ b/app/controllers/projects/webhooks_controller.rb
@@ -80,6 +80,7 @@ class Projects::WebhooksController < Projects::BaseController
   private 
   def find_webhook
     @webhook = Gitea::Webhook.find_by_id(params[:id])
+    return render_not_found if @webhook.nil?
   end
 
   def webhook_params 
diff --git a/app/views/projects/webhooks/edit.json.jbuilder b/app/views/projects/webhooks/edit.json.jbuilder
index 8d5922ded..2ee6d24e8 100644
--- a/app/views/projects/webhooks/edit.json.jbuilder
+++ b/app/views/projects/webhooks/edit.json.jbuilder
@@ -5,7 +5,7 @@ json.create_time Time.at(@webhook.created_unix).strftime("%Y-%m-%d %H:%M:%S")
 event = @webhook.events
 json.branch_filter event["branch_filter"]
 if event["send_everything"]
-  json.events event["events"].keys
+  json.events event["events"].keys.collect{|i| i == "pull_request" ?  i + "_only" : i}
 else 
-  json.events event["events"].select{|k, v| v}.keys
+  json.events event["events"].select{|k, v| v}.keys.collect{|i| i == "pull_request" ?  i + "_only" : i}
 end