diff --git a/src/gui/set/cards_panel.cpp b/src/gui/set/cards_panel.cpp
index b185624d..f91681b2 100644
--- a/src/gui/set/cards_panel.cpp
+++ b/src/gui/set/cards_panel.cpp
@@ -158,7 +158,7 @@ void CardsPanel::onUpdateUI(wxUpdateUIEvent& ev) {
 			ev.Check(ss.card_angle() == a);
 			break;
 		}
-		case ID_CARD_REMOVE:     ev.Enable(set->cards.size() > 0);			break;
+		case ID_CARD_REMOVE:     ev.Enable(set->cards.size() > 1);			break;
 		case ID_FORMAT_BOLD: case ID_FORMAT_ITALIC: case ID_FORMAT_SYMBOL: case ID_FORMAT_REMINDER: {
 			if (focused_control(this) == ID_EDITOR) {
 				ev.Enable(editor->canFormat(ev.GetId()));
diff --git a/src/util/rotation.cpp b/src/util/rotation.cpp
index 0e4c7e50..9d57e555 100644
--- a/src/util/rotation.cpp
+++ b/src/util/rotation.cpp
@@ -250,10 +250,18 @@ RealSize RotatedDC::GetTextExtent(const String& text) const {
 	}
 }
 double RotatedDC::GetCharHeight() const {
+	int h = dc.GetCharHeight();
+	#ifdef __WXGTK__
+		// See above HACK
+		int extent;
+		dc.GetTextExtent(_("H"), 0, &extent);
+		if (h != extent)
+			h = 2 * extent - h;
+	#endif
 	if (quality == QUALITY_LOW) {
-		return dc.GetCharHeight() / zoom;
+		return h / zoom;
 	} else {
-		return dc.GetCharHeight() / zoom / text_scaling;
+		return h / zoom / text_scaling;
 	}
 }