diff --git a/qt/widgets.cpp b/qt/widgets.cpp
index 7e733174f4..a70a295c2b 100644
--- a/qt/widgets.cpp
+++ b/qt/widgets.cpp
@@ -27,6 +27,13 @@ namespace qt
     return m_p;
   }
 
+  GLDrawWidget::~GLDrawWidget()
+  {
+    makeCurrent();
+    m_p.reset();
+    doneCurrent();
+  }
+
   void GLDrawWidget::initializeGL()
   {
     /// we'll perform swap by ourselves, see issue #333
diff --git a/qt/widgets.hpp b/qt/widgets.hpp
index cc8fc98aa6..9a7f2c1130 100644
--- a/qt/widgets.hpp
+++ b/qt/widgets.hpp
@@ -29,6 +29,7 @@ namespace qt
     typedef DrawerYG drawer_t;
 
     GLDrawWidget(QWidget * pParent);
+    ~GLDrawWidget();
 
     shared_ptr<yg::gl::RenderContext> const & renderContext();
     shared_ptr<yg::ResourceManager> const & resourceManager();