diff --git a/src/gui/drop_down_list.cpp b/src/gui/drop_down_list.cpp
index ac775242..471a7c75 100644
--- a/src/gui/drop_down_list.cpp
+++ b/src/gui/drop_down_list.cpp
@@ -37,10 +37,8 @@ class DropDownHider : public wxEvtHandler {
 			// don't just use ev.Skip(), because this event handler will be removed by hiding,
 			// so there will be no next handler to skip to
 			wxEvtHandler* nh = GetNextHandler();
-			wxLogDebug(L"close to %p", nh);
 			list.hide(false);
 			if (nh) nh->ProcessEvent(ev);
-			wxLogDebug(L"/close to %p", nh);
 			return false;
 		} else {
 //			if (t !=10093 && t !=10098 && t !=10097 && t !=10099 && t !=10004 && t !=10062
@@ -80,6 +78,7 @@ DropDownList::DropDownList(Window* parent, bool is_submenu, ValueViewer* viewer)
 }
 
 DropDownList::~DropDownList() {
+	realHide(); // restore event handler before deleting it
 	delete hider;
 }
 
diff --git a/src/gui/value/choice.cpp b/src/gui/value/choice.cpp
index d12871a5..7c5981e1 100644
--- a/src/gui/value/choice.cpp
+++ b/src/gui/value/choice.cpp
@@ -54,7 +54,7 @@ void ChoiceThumbnailRequest::store(const Image& img) {
 		#ifdef __WXMSW__
 			// for some reason windows doesn't like completely transparent images if they do not have a mask
 			// HACK:
-			if (img.GetWidth() == 16 && img.GetHeight() == 16) {
+			if (img.HasAlpha() && img.GetWidth() == 16 && img.GetHeight() == 16) {
 				// is the image empty?
 				bool empty = true;
 				int* b = (int*)img.GetAlpha();