diff --git a/node_wrangler.py b/node_wrangler.py
index 06b7f74281f95a9f623c8d9893e7e91f5307d482..0cf3c6c77e8fb6b2fe57c48cfb5a0c8d8e6d5e93 100644
--- a/node_wrangler.py
+++ b/node_wrangler.py
@@ -19,9 +19,9 @@
 bl_info = {
     "name": "Node Wrangler",
     "author": "Bartek Skorupa, Greg Zaal, Sebastian Koenig",
-    "version": (3, 20),
+    "version": (3, 21),
     "blender": (2, 72, 0),
-    "location": "Node Editor Properties Panel or Ctrl-Space",
+    "location": "Node Editor Toolbar or Ctrl-Space",
     "description": "Various tools to enhance and speed up node-based workflow",
     "warning": "",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
@@ -3168,8 +3168,9 @@ def drawlayout(context, layout, mode='non-panel'):
 class NodeWranglerPanel(Panel, NWBase):
     bl_idname = "NODE_PT_nw_node_wrangler"
     bl_space_type = 'NODE_EDITOR'
-    bl_region_type = 'UI'
     bl_label = "Node Wrangler"
+    bl_region_type = "TOOLS"
+    bl_category = "Node Wrangler"
 
     prepend = StringProperty(
         name='prepend',