diff --git a/chrome/chromeFiles/content/scholar/itemPane.js b/chrome/chromeFiles/content/scholar/itemPane.js
index 4f9230063..7a5b9bf9e 100644
--- a/chrome/chromeFiles/content/scholar/itemPane.js
+++ b/chrome/chromeFiles/content/scholar/itemPane.js
@@ -50,7 +50,10 @@ ScholarItemPane = new function()
 	 * Loads an item 
 	 */
 	function viewItem(thisItem)
-	{		
+	{
+		if(_itemBeingEdited && thisItem.getID() == _itemBeingEdited.getID())
+			return;
+			
 		_itemBeingEdited = thisItem;
 		
 		reloadFields();
diff --git a/chrome/chromeFiles/content/scholar/itemTreeView.js b/chrome/chromeFiles/content/scholar/itemTreeView.js
index a5b34f0aa..d649ce552 100644
--- a/chrome/chromeFiles/content/scholar/itemTreeView.js
+++ b/chrome/chromeFiles/content/scholar/itemTreeView.js
@@ -233,6 +233,13 @@ Scholar.ItemTreeView.prototype.sort = function()
 			return (typeA > typeB) ? -1 : (typeA < typeB) ? 1 : 0;
 		}
 	}
+	else if(column.id == 'numNotes')
+	{
+		function columnSort(a,b)
+		{
+			return b.numNotes() - a.numNotes();
+		}
+	}
 	else
 	{
 		function columnSort(a,b)
@@ -241,15 +248,29 @@ Scholar.ItemTreeView.prototype.sort = function()
 		}
 	}
 	
+	function doSort(a,b)
+	{
+		var s = columnSort(a,b);
+		if(s)
+			return s;
+		else
+			return secondarySort(a,b);
+	}
+	
 	function oppositeSort(a,b)
 	{
-		return(columnSort(a,b) * -1);
+		return(doSort(a,b) * -1);
+	}
+	
+	function secondarySort(a,b)
+	{
+		return (a.getField('dateModified') > b.getField('dateModified')) ? -1 : (a.getField('dateModified') < b.getField('dateModified')) ? 1 : 0;
 	}
 	
 	if(order)
 		this._dataItems.sort(oppositeSort);
 	else
-		this._dataItems.sort(columnSort);
+		this._dataItems.sort(doSort);
 		
 	this._refreshHashMap();