diff --git a/src/FolderManager/FileView.vala b/src/FolderManager/FileView.vala
index e18af91865..cb70736b1a 100644
--- a/src/FolderManager/FileView.vala
+++ b/src/FolderManager/FileView.vala
@@ -74,18 +74,6 @@ namespace Scratch.FolderManager {
             write_settings ();
         }
 
-        public void close_active_folder () {
-            ProjectFolderItem project_root;
-
-            if (selected is FileItem) {
-                project_root = (selected.parent as FolderItem).get_root_folder ();
-            } else {
-                project_root = (selected as FolderItem).get_root_folder ();
-            }
-
-            project_root.closed();
-        }
-
         public void collapse_all () {
             foreach (var child in root.children) {
                 (child as ProjectFolderItem).collapse_all ();
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 2c1640b14d..3aba03b5e8 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -63,7 +63,6 @@ namespace Scratch {
         public const string ACTION_FIND_PREVIOUS = "action_find_previous";
         public const string ACTION_OPEN = "action_open";
         public const string ACTION_OPEN_FOLDER = "action_open_folder";
-        public const string ACTION_CLOSE_ACTIVE_FOLDER = "action_close_active_folder";
         public const string ACTION_COLLAPSE_ALL_FOLDERS = "action_collapse_all_folders";
         public const string ACTION_ORDER_FOLDERS = "action_order_folders";
         public const string ACTION_GO_TO = "action_go_to";
@@ -100,7 +99,6 @@ namespace Scratch {
             { ACTION_FIND_PREVIOUS, action_find_previous },
             { ACTION_OPEN, action_open },
             { ACTION_OPEN_FOLDER, action_open_folder },
-            { ACTION_CLOSE_ACTIVE_FOLDER, action_close_active_folder },
             { ACTION_COLLAPSE_ALL_FOLDERS, action_collapse_all_folders },
             { ACTION_ORDER_FOLDERS, action_order_folders },
             { ACTION_PREFERENCES, action_preferences },
@@ -302,7 +300,6 @@ namespace Scratch {
 
                 // Set actions sensitive property
                 Utils.action_from_group (ACTION_SAVE_AS, actions).set_enabled (doc.file != null);
-                Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null);
                 doc.check_undoable_actions ();
             });
 
@@ -310,10 +307,6 @@ namespace Scratch {
 
             folder_manager_view = new FolderManager.FileView ();
 
-            folder_manager_view.item_selected.connect (() => {
-                Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null);
-            });
-
             folder_manager_view.select.connect ((a) => {
                 var file = new Scratch.FolderManager.File (a);
                 var doc = new Scratch.Services.Document (actions, file.file);
@@ -323,8 +316,6 @@ namespace Scratch {
                 } else {
                     open_binary (file.file);
                 }
-
-                Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null);
             });
 
             folder_manager_view.root.child_added.connect (() => {
@@ -332,16 +323,12 @@ namespace Scratch {
                     project_pane.add_tab (folder_manager_view);
                     folder_manager_view.show_all ();
                 }
-
-                Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null);
             });
 
             folder_manager_view.root.child_removed.connect (() => {
                 if (folder_manager_view.get_n_visible_children (folder_manager_view.root) == 1) {
                     folder_manager_view.parent.remove (folder_manager_view);
                 }
-                
-                Utils.action_from_group (ACTION_CLOSE_ACTIVE_FOLDER, actions).set_enabled (folder_manager_view.selected != null);
             });
 
             folder_manager_view.restore_saved_state ();
@@ -828,10 +815,6 @@ namespace Scratch {
             chooser.destroy ();
         }
 
-        private void action_close_active_folder () {
-            folder_manager_view.close_active_folder ();
-        }
-
         private void action_collapse_all_folders () {
             folder_manager_view.collapse_all ();
         }
diff --git a/src/Widgets/Pane.vala b/src/Widgets/Pane.vala
index 17504923b6..5ba93d7038 100644
--- a/src/Widgets/Pane.vala
+++ b/src/Widgets/Pane.vala
@@ -43,10 +43,6 @@ public class Code.Pane : Gtk.Grid {
         add_folder_button.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_OPEN_FOLDER;
         add_folder_button.tooltip_text = _("Add Project Folder…");
 
-        var remove_folder_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("folder-move-symbolic", Gtk.IconSize.BUTTON), null);
-        remove_folder_button.action_name = Scratch.MainWindow.ACTION_PREFIX + Scratch.MainWindow.ACTION_CLOSE_ACTIVE_FOLDER;
-        remove_folder_button.tooltip_text = _("Remove Project Folder");
-
         var project_more_button = new Gtk.MenuToolButton (null, null);
         project_more_button.tooltip_text = _("More…");
         
@@ -68,7 +64,6 @@ public class Code.Pane : Gtk.Grid {
         separator_tool_item.draw = false;
 
         toolbar.add (add_folder_button);
-        toolbar.add (remove_folder_button);
         toolbar.add (separator_tool_item);
         toolbar.add (project_more_button);