diff --git a/src/view/SnapshotsDialog.cpp b/src/view/SnapshotsDialog.cpp
index 788ebf1..31a1aec 100644
--- a/src/view/SnapshotsDialog.cpp
+++ b/src/view/SnapshotsDialog.cpp
@@ -183,6 +183,8 @@ void SnapshotsDialog::OnBackTo()
     _kiss->LoadUser(user);
 
     QMessageBox::information(0, "KissCount", _("Welcome back to ") + filename);
+
+    close();
 }
 
 void SnapshotsDialog::OnOK()
diff --git a/src/view/wxUI.cpp b/src/view/wxUI.cpp
index 6defc4e..7adeb98 100644
--- a/src/view/wxUI.cpp
+++ b/src/view/wxUI.cpp
@@ -212,6 +212,7 @@ void wxUI::LoadPanels()
     	{
     	    temp = _panels[i]->CreatePanel();
     	    _buttons[i]->disconnect(&_signalMapper, SLOT(map()));
+	    delete _panels[i];
     	    _panels[i] = temp;
 	    connect(_buttons[i], SIGNAL(clicked()), &_signalMapper, SLOT(map()));
     	    _buttons[i]->setToolTip(temp->GetToolTip());