diff --git a/runbot/models/build_error.py b/runbot/models/build_error.py
index 4cd5dc4c..d6668f21 100644
--- a/runbot/models/build_error.py
+++ b/runbot/models/build_error.py
@@ -306,6 +306,8 @@ class ErrorReassignWizard(models.TransientModel):
 
     team_id = fields.Many2one('runbot.team', 'Assigned team')
     responsible_id = fields.Many2one('res.users', 'Assigned fixer')
+    fixing_pr_id = fields.Many2one('runbot.branch', 'Fixing PR', domain=[('is_pr', '=', True)])
+    fixing_commit = fields.Char('Fixing commit')
 
     def submit(self):
         error_ids = self.env['runbot.build.error'].browse(self.env.context.get('active_ids'))
@@ -314,3 +316,7 @@ class ErrorReassignWizard(models.TransientModel):
                 error_ids['team_id'] = self.team_id
             if self.responsible_id:
                 error_ids['responsible'] = self.responsible_id
+            if self.fixing_pr_id:
+                error_ids['fixing_pr_id'] = self.fixing_pr_id
+            if self.fixing_commit:
+                error_ids['fixing_commit'] = self.fixing_commit
diff --git a/runbot/views/build_error_views.xml b/runbot/views/build_error_views.xml
index 2c107621..56945fa4 100644
--- a/runbot/views/build_error_views.xml
+++ b/runbot/views/build_error_views.xml
@@ -259,6 +259,10 @@
                 <field name="team_id"/>
                 <field name="responsible_id"/>
               </group>
+              <group name="Fix">
+                <field name="fixing_pr_id"/>
+                <field name="fixing_commit"/>
+              </group>
               <footer>
                 <button string="Submit" name="submit" type="object" class="btn-primary"/>
                 <button string="Cancel" class="btn-secondary" special="cancel"/>
@@ -269,7 +273,7 @@
     </record>
 
     <record id="runbot_open_reassign_wizard" model="ir.actions.act_window">
-        <field name="name">Reassign to another Team and/or User</field>
+        <field name="name">Assign Team/User/PR Wizard</field>
         <field name="res_model">runbot.error.reassign.wizard</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>