diff --git a/lib/galaxy/web/controllers/history.py b/lib/galaxy/web/controllers/history.py
index a9548f3c8a1..f5c21c84ec9 100644
--- a/lib/galaxy/web/controllers/history.py
+++ b/lib/galaxy/web/controllers/history.py
@@ -177,7 +177,8 @@ class HistoryController( BaseController, Sharable, UsesAnnotations, UsesHistory
             operation = kwargs['operation'].lower()
             if operation == "share or publish":
                 return self.sharing( trans, **kwargs )
-            if operation == "rename":
+            if operation == "rename" and kwargs.get('id', None): # Don't call rename if no ids
+                del kwargs['name'] # Remove ajax name param that rename method uses
                 return self.rename( trans, **kwargs )
             history_ids = util.listify( kwargs.get( 'id', [] ) )
             # Display no message by default