diff --git a/wp-admin/css/media.css b/wp-admin/css/media.css
index a5b354ef6..b492a3a53 100644
--- a/wp-admin/css/media.css
+++ b/wp-admin/css/media.css
@@ -8,7 +8,7 @@ div#media-upload-header {
 	height: 2.5em;
 }
 
-ul#sidemenu {
+body#media-upload ul#sidemenu {
 	font-weight: normal;
 	margin: 0 5px;
 	position: absolute;
diff --git a/wp-admin/media.php b/wp-admin/media.php
index bd64104a8..e91b511e6 100644
--- a/wp-admin/media.php
+++ b/wp-admin/media.php
@@ -8,8 +8,6 @@ $submenu_file = 'upload.php';
 wp_reset_vars(array('action'));
 
 switch( $action ) :
-case 'upload' :
-case 'delete' : break; // stubs
 case 'editattachment' :
 	$errors = media_upload_form_handler();
 	if ( empty($errors) ) {
@@ -78,10 +76,13 @@ case 'edit' :
 
 	require( 'admin-footer.php' );
 
-	break;
+	exit;
+
+default:
+	wp_redirect( 'upload.php' );
+	exit;
+
 endswitch;
 
-wp_redirect( 'upload.php' );
-exit;
 
 ?>