diff --git a/chrome/content/zotero/itemPane.js b/chrome/content/zotero/itemPane.js
index c055081a6..bb284efcb 100644
--- a/chrome/content/zotero/itemPane.js
+++ b/chrome/content/zotero/itemPane.js
@@ -87,12 +87,15 @@ var ZoteroItemPane = new function() {
 		
 		_lastItem = item;
 		
-		// Hide for feed items
-		document.getElementById('zotero-editpane-tabs').setAttribute('hidden', item.isFeedItem);
-		document.getElementById('zotero-view-item').classList.add('no-tabs');
+		var viewBox = document.getElementById('zotero-view-item');
+		viewBox.classList.remove('no-tabs');
 		
 		if (index == 0) {
+			document.getElementById('zotero-editpane-tabs').setAttribute('hidden', item.isFeedItem);
+			
 			if (item.isFeedItem) {
+				viewBox.classList.add('no-tabs');
+				
 				let lastTranslationTarget = Zotero.Prefs.get('feeds.lastTranslationTarget');
 				if (lastTranslationTarget) {
 					let id = parseInt(lastTranslationTarget.substr(1));
diff --git a/chrome/content/zotero/itemPane.xul b/chrome/content/zotero/itemPane.xul
index cd9fb9f1e..c3a64a883 100644
--- a/chrome/content/zotero/itemPane.xul
+++ b/chrome/content/zotero/itemPane.xul
@@ -75,7 +75,7 @@
 					</tabpanel>
 					
 					<tabpanel flex="1" orient="vertical">
-						<vbox flex="1" class="zotero-box">
+						<vbox flex="1" id="zotero-editpane-notes" class="zotero-box">
 							<hbox align="center">
 								<label id="zotero-editpane-notes-label"/>
 								<button id="zotero-editpane-notes-add" label="&zotero.item.add;" oncommand="ZoteroItemPane.addNote(event.shiftKey);"/>
diff --git a/chrome/skin/default/zotero/itemPane.css b/chrome/skin/default/zotero/itemPane.css
index 58eba29da..d16805077 100644
--- a/chrome/skin/default/zotero/itemPane.css
+++ b/chrome/skin/default/zotero/itemPane.css
@@ -22,12 +22,12 @@
 
 #zotero-view-item
 {
-	padding: 1.5em .25em .25em;
+	padding: 0;
 }
 
 #zotero-view-item.no-tabs
 {
-	padding: .25em .25em .25em;
+	margin-top: 0;
 }
 
 #zotero-view-item > tabpanel > *
@@ -35,13 +35,17 @@
 	overflow: auto;
 }
 
+#zotero-view-item:not([selectedIndex="0"]) > tabpanel > * {
+	padding-top: .25em;
+}
+
 #zotero-view-item > vbox
 {
 	overflow: auto;
 	margin-left: 5px;
 }
 
-/* Restore/Delete buttons in trash view */
+/* Buttons in trash and feed views */
 .zotero-item-pane-top-buttons {
 	-moz-appearance: toolbar;
 	-moz-box-pack: center;