diff --git a/src/main/webapp/css/app.css b/src/main/webapp/css/app.css
index 57ef0d05..d0ed771b 100644
--- a/src/main/webapp/css/app.css
+++ b/src/main/webapp/css/app.css
@@ -45,28 +45,28 @@
 	margin-top: 80px;
 }
 
-#feed-accordion .entry .entry-heading a {
+#feed-accordion .entry-heading {
 	padding: 6px 0px;
+}
+
+#feed-accordion .entry-heading.open {
 	background-color: #EBEBEB;
 }
 
-#feed-accordion .entry .entry-heading a.collapsed {
-	background-color: #FFF;
-}
-
-#feed-accordion .entry .entry-heading a.collapsed:hover {
+#feed-accordion .entry-heading.closed:hover {
 	background-color: #EBEBEB;
 }
 
-#feed-accordion .entry .entry-heading a {
+#feed-accordion a.accordion-toggle  {
 	color: black;
 	display: block;
+	padding: 0px;
 }
 
-#feed-accordion .entry .entry-heading a:hover {
+#feed-accordion a.accordion-toggle:hover {
 	text-decoration: none;
 }
 
-#feed-accordion .entry .entry-heading .unread {
+#feed-accordion a.accordion-toggle .unread {
 	font-weight: bold;
 }
\ No newline at end of file
diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index b9fd9649..1037d702 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -158,4 +158,9 @@ module.controller('FeedListCtrl', function($scope, $routeParams, $http,
 			});
 		}
 	};
+	
+	$scope.toggle = function(entry) {
+		$scope.current = entry;
+		$scope.mark(entry, true);
+	}
 });
diff --git a/src/main/webapp/templates/feeds.html b/src/main/webapp/templates/feeds.html
index a0373c0d..39bcf926 100644
--- a/src/main/webapp/templates/feeds.html
+++ b/src/main/webapp/templates/feeds.html
@@ -3,17 +3,14 @@
 	<span>{{entryList.name}}</span><span
 		ng-show="selectedType == 'category'"> &#187;</span>
 	<div id="feed-accordion" infinite-scroll="loadMoreEntries()" infinite-scroll-disabled="busy" infinite-scroll-distance="1">
-		<div ng-repeat="entry in entryList.entries" class="entry accordion-group">
-			<div class="entry-heading">
-				<a class="accordion-toggle collapsed" data-toggle="collapse"
-					ng-click="mark(entry, true)"
-					ng-class="{unread: entry.read == false}"
-					data-parent="#feed-accordion" href="{{'#feed-body' + $index}}">
-					<span ng-show="selectedType == 'category'">{{entry.feedName}}
-						- </span>{{entry.title}} <span class="pull-right">{{entry.date}}</span>
-				</a>
-			</div>
-			<div id="{{'feed-body' + $index}}" class="collapse">
+		<accordion close-others="true">
+			<accordion-group ng-repeat="entry in entryList.entries" class="entry">
+				<accordion-heading>
+					<div class="entry-heading" ng-click="toggle(entry)" ng-class="{unread: entry.read == false, open: current == entry, closed: current != entry}">
+						<span ng-show="selectedType == 'category'">{{entry.feedName}}
+							- </span>{{entry.title}} <span class="pull-right">{{entry.date}}</span>
+					</div>
+				</accordion-heading>
 				<div>
 					<div>
 						<h4>
@@ -22,8 +19,8 @@
 					</div>	
 					<div ng-bind-html="entry.content"></div>
 				</div>
-			</div>
-		</div>
+			</accordion-group>
+		</accordion>
 		<div class="no-entries" ng-show="entryList.entries.length == 0">"{{entryList.name}}" has no unread items.</div>
 		<div ng-show="busy">Loading data...</div>
 	</div>