diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js
index 2b6e98b..2b47872 100644
--- a/IPython/html/static/tree/js/notebooklist.js
+++ b/IPython/html/static/tree/js/notebooklist.js
@@ -337,16 +337,18 @@ define([
         var that = this;
         $('.list_item :checked').each(function(index, item) {
             var parent = $(item).parent().parent();
-            selected.push({
-                name: parent.data('name'), 
-                path: parent.data('path'), 
-                type: parent.data('type')
-            });
+            if (parent.find('.upload_button').length === 0) {
+                selected.push({
+                    name: parent.data('name'), 
+                    path: parent.data('path'), 
+                    type: parent.data('type')
+                });
 
-            has_running_notebook = has_running_notebook || 
-                (parent.data('type') == 'notebook' && that.sessions[parent.data('path')] !== undefined);
-            has_file = has_file || parent.data('type') == 'file';
-            has_directory = has_directory || parent.data('type') == 'directory';
+                has_running_notebook = has_running_notebook || 
+                    (parent.data('type') == 'notebook' && that.sessions[parent.data('path')] !== undefined);
+                has_file = has_file || parent.data('type') == 'file';
+                has_directory = has_directory || parent.data('type') == 'directory';    
+            }
         });
         this.selected = selected;
 
@@ -672,7 +674,6 @@ define([
                 var on_success = function () {
                     item.removeClass('new-file');
                     that.add_link(model, item);
-                    that.add_delete_button(item);
                     that.session_list.load_sessions();
                 };
                 
diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less
index 4f808ed..4e2d700 100644
--- a/IPython/html/static/tree/less/tree.less
+++ b/IPython/html/static/tree/less/tree.less
@@ -98,6 +98,10 @@ ul.breadcrumb {
     }
 }
 
+.new-file input[type=checkbox] {
+    visibility: hidden;
+}
+
 .item_name {
     line-height: @btn_mini_height;
     height: @btn_small_height;