diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp
index e09f31abbe..28235ece09 100644
--- a/UI/GameInfoCache.cpp
+++ b/UI/GameInfoCache.cpp
@@ -201,6 +201,9 @@ public:
 					}
 				}
 			}
+
+			break;
+
 		case FILETYPE_PSP_ELF:
 			// An elf on its own has no usable information, no icons, no nothing.
 			info_->title = getFilename(filename);
@@ -220,7 +223,7 @@ public:
 				delete [] contents;
 			}
 
-			return;
+			break;
 
 		case FILETYPE_PSP_ISO:
 		case FILETYPE_PSP_ISO_NP:
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index 20b9bc214a..dd39ee71d2 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -104,16 +104,14 @@ void GameButton::Draw(UIContext &dc) {
 	}
 
 	if (texture) {
+		dc.Draw()->Flush();
 		texture->Bind(0);
 		dc.Draw()->DrawTexRect(x, y, x+w, y+h, 0, 0, 1, 1, color);
 		dc.Draw()->Flush();
+		dc.RebindTexture();
 	} else {
 		dc.FillRect(dc.theme->buttonStyle.background, bounds_);
-		dc.Draw()->Flush();
-		Texture::Unbind();
 	}
-	
-	dc.RebindTexture();
 }
 
 // Abstraction above path that lets you navigate easily.