diff --git a/include/widgets/wx_grid.h b/include/widgets/wx_grid.h
index a84bdcaa62..c3cfaf8f99 100644
--- a/include/widgets/wx_grid.h
+++ b/include/widgets/wx_grid.h
@@ -175,6 +175,7 @@ public:
      * re-purpose this hack to work-around the bugs when we want to open an editor.
      */
     void ShowEditorOnMouseUp() { m_waitForSlowClick = true; }
+    void CancelShowEditorOnMouseUp() { m_waitForSlowClick = false; }
 
     /**
      * wxWidgets recently added an ASSERT which fires if the position is greater than or equal
diff --git a/kicad/dialogs/panel_jobs.cpp b/kicad/dialogs/panel_jobs.cpp
index c1181f859b..7c49b0d875 100644
--- a/kicad/dialogs/panel_jobs.cpp
+++ b/kicad/dialogs/panel_jobs.cpp
@@ -516,6 +516,8 @@ void JOBS_GRID_TRICKS::doPopupSelection( wxCommandEvent& event )
 
 bool JOBS_GRID_TRICKS::handleDoubleClick( wxGridEvent& aEvent )
 {
+    m_grid->CancelShowEditorOnMouseUp();
+
     int col = aEvent.GetCol();
     int row = aEvent.GetRow();