1 files changed, 4 insertions, 2 deletions
diff --git a/client/macrowindow.cc b/client/macrowindow.cc
index 44f2797..2e0f52a 100644
--- a/client/macrowindow.cc
+++ b/client/macrowindow.cc
@@ -189,11 +189,13 @@ bool MacroWindow::doCommit()
 void MacroWindow::commit()
 {
   doCommit();
+  drawer->setFocus();
 }
 
 void MacroWindow::cancel()
 {
   collapseWrapper();
+  drawer->setFocus();
 }
 
 void MacroWindow::expandWrapper()
@@ -271,9 +273,9 @@ void MacroWindow::clear()
   lua->clear();
 
   if(mainwidget) {
-    delete mainwidget;
-    mainwidget = NULL;
     drawer->setFocus();
+    mainwidget->deleteLater();
+    mainwidget = NULL;
   }
 }