diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index c826e2b499..22096fc6e1 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -1561,6 +1561,10 @@ public:
     }
 
 
+    // override some base class functions
+    virtual bool Enable(bool enable = true);
+
+
     // ------ For compatibility with previous wxGrid only...
     //
     //  ************************************************
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index dad2139822..712326e611 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -7524,6 +7524,16 @@ void wxGrid::ForceRefresh()
     EndBatch();
 }
 
+bool wxGrid::Enable(bool enable)
+{
+    if ( !wxScrolledWindow::Enable(enable) )
+        return false;
+
+    // redraw in the new state
+    m_gridWin->Refresh();
+
+    return true;
+}
 
 //
 // ------ Edit control functions