diff --git a/chrome/chromeFiles/content/scholar/customControls.xml b/chrome/chromeFiles/content/scholar/customControls.xml
index 836a6b584d..d69c1eaee6 100644
--- a/chrome/chromeFiles/content/scholar/customControls.xml
+++ b/chrome/chromeFiles/content/scholar/customControls.xml
@@ -125,7 +125,7 @@
 				<xul:textbox multiline="true" type="timed" timeout="1000" flex="1" oncommand="this.parentNode.parentNode.save();"/>
 				<xul:label value="See also: (coming soon)"/>
 				<xul:label onclick="this.nextSibling.showPopup(this,-1,-1,'popup',0,0);"/>
-				<xul:popup width="300" onpopuphidden="this.updateTagsSummary();">
+				<xul:popup width="300" onpopuphidden="this.parentNode.parentNode.updateTagsSummary();">
 					<xul:tagsbox/>
 				</xul:popup>
 			</xul:vbox>
diff --git a/chrome/chromeFiles/content/scholar/overlay.js b/chrome/chromeFiles/content/scholar/overlay.js
index 2e5d4b630d..1f8b1f9995 100644
--- a/chrome/chromeFiles/content/scholar/overlay.js
+++ b/chrome/chromeFiles/content/scholar/overlay.js
@@ -11,6 +11,7 @@ var ScholarPane = new function()
 	this.onLoad = onLoad;
 	this.onUnload = onUnload;
 	this.toggleDisplay = toggleDisplay;
+	this.fullScreen = fullScreen;
 	this.newItem = newItem;
 	this.newCollection = newCollection;
 	this.onCollectionSelected = onCollectionSelected;
@@ -79,6 +80,15 @@ var ScholarPane = new function()
 		
 		document.getElementById('scholar-pane').setAttribute('collapsed',!visible);
 		document.getElementById('scholar-splitter').setAttribute('collapsed',!visible);
+		
+		if(!visible)
+			document.getElementById('content').setAttribute('collapsed', false);
+	}
+	
+	function fullScreen()
+	{
+		var visible = document.getElementById('content').getAttribute('collapsed') == 'true';
+		document.getElementById('content').setAttribute('collapsed', !visible);
 	}
 		
 	/*
diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul
index 0b61f8614f..abfe9376bf 100644
--- a/chrome/chromeFiles/content/scholar/overlay.xul
+++ b/chrome/chromeFiles/content/scholar/overlay.xul
@@ -21,7 +21,7 @@
 	
 	<vbox id="appcontent">
 		<splitter id="scholar-splitter" resizebefore="closest" resizeafter="closest" persist="collapsed"/>
-		<vbox id="scholar-pane" persist="height collapsed">
+		<vbox id="scholar-pane" flex="1" persist="height collapsed">
 			<popupset>
 				<popup id="scholar-collectionmenu" onpopupshowing="ScholarPane.buildCollectionContextMenu();">
 					<menuitem label="&toolbar.newCollection.label;" command="cmd_scholar_newCollection"/>
@@ -39,6 +39,7 @@
 				<label value="Scholar" id="scholar-toolbar-name"/>
 				<label value="1.0 Alpha"/>
 				<spacer flex="1"/>
+				<toolbarbutton id="tb-fullscreen" tooltiptext="Toggle Fullscreen" oncommand="ScholarPane.fullScreen();"/>
 				<toolbarbutton class="tabs-closebutton" oncommand="ScholarPane.toggleDisplay()"/>
 			</toolbar>
 			<hbox flex="1">
diff --git a/chrome/chromeFiles/skin/default/scholar/overlay.css b/chrome/chromeFiles/skin/default/scholar/overlay.css
index 83cf8f7564..cad0e887de 100644
--- a/chrome/chromeFiles/skin/default/scholar/overlay.css
+++ b/chrome/chromeFiles/skin/default/scholar/overlay.css
@@ -60,6 +60,11 @@ vbox #scholar-pane
 	font-size: larger;
 }
 
+#tb-fullscreen
+{
+	list-style-image: url('chrome://scholar/skin/toolbar-fullscreen.png');
+}
+
 #tb-collection-add
 {
 	list-style-image: url('chrome://scholar/skin/toolbar-collection-add.png');
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen.png b/chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen.png
new file mode 100755
index 0000000000..a91c78a5c4
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen.png differ