--- a/src/hugin1/hugin/CPEditorPanel.h
+++ b/src/hugin1/hugin/CPEditorPanel.h
@@ -37,13 +37,17 @@
 
 #include <PT/Panorama.h>
 
-#ifdef __WXMAC__
-// use wxChoice
+
+// Always use wxChoice, it behaves badly on GTK as well.
 #define HUGIN_CP_IMG_CHOICE
-#else
-// use wxNotebook tab
-#define HUGIN_CP_IMG_TAB
-#endif
+
+//#ifdef __WXMAC__
+//// use wxChoice
+//#define HUGIN_CP_IMG_CHOICE
+//#else
+//// use wxNotebook tab
+//#define HUGIN_CP_IMG_TAB
+//#endif
 
 #include "CPImageCtrl.h"