diff --git a/Common/UI/TabHolder.cpp b/Common/UI/TabHolder.cpp
index 073df5b3b9..0a572b36c0 100644
--- a/Common/UI/TabHolder.cpp
+++ b/Common/UI/TabHolder.cpp
@@ -237,13 +237,13 @@ void ChoiceStrip::AddChoice(ImageID buttonImage) {
 }
 
 void ChoiceStrip::AddBackButton() {
-	Choice *c = new Choice(ImageID("I_NAVIGATE_BACK"));
+	Choice *c = new Choice(ImageID("I_NAVIGATE_BACK"), new LinearLayoutParams(ITEM_HEIGHT, ITEM_HEIGHT));
 	c->OnClick.Add([](EventParams &e) {
 		e.bubbleResult = DR_BACK;
 	});
 	// c->OnClick.Handle(this, &UIScreen::OnBack);
 	Add(c);
-	Add(new Spacer(5.0f));
+	Add(new Spacer(8.0f));
 }
 
 void ChoiceStrip::OnChoiceClick(EventParams &e) {
diff --git a/UI/RetroAchievementScreens.cpp b/UI/RetroAchievementScreens.cpp
index 40f2bf7560..a6169676ac 100644
--- a/UI/RetroAchievementScreens.cpp
+++ b/UI/RetroAchievementScreens.cpp
@@ -49,10 +49,15 @@ AudioFileChooser::AudioFileChooser(RequesterToken token, std::string *value, std
 			value->clear();
 		}
 	});
-	Add(new Choice(ImageID("I_TRASHCAN"), new LinearLayoutParams(ITEM_HEIGHT, ITEM_HEIGHT)))->OnClick.Add([=](UI::EventParams &) {
+	Choice *trash = new Choice(ImageID("I_TRASHCAN"), new LinearLayoutParams(ITEM_HEIGHT, ITEM_HEIGHT));
+	trash->OnClick.Add([=](UI::EventParams &) {
 		g_BackgroundAudio.SFX().UpdateSample(sound, nullptr);
 		value->clear();
 	});
+	Add(trash);
+	trash->SetEnabledFunc([=]() {
+		return !value->empty();
+	});
 }
 
 void RetroAchievementsListScreen::CreateTabs() {