diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index ce16fdb5..92181be1 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -692,6 +692,7 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
 	var focusNextEntry = function(event) {
 		var entry = _getNextEntry();
 		if (entry) {
+			$scope.navigationMode = 'click';
 			$scope.current = entry;
 		}
 	};
@@ -699,6 +700,7 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
 	var focusPreviousEntry = function(event) {
 		var entry = _getPreviousEntry();
 		if (entry) {
+			$scope.navigationMode = 'click';
 			$scope.current = entry;
 		}
 	};
diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html
index 91c1d653..5bae5485 100644
--- a/src/main/webapp/templates/feeds.view.html
+++ b/src/main/webapp/templates/feeds.view.html
@@ -6,7 +6,7 @@
 	<div infinite-scroll="loadMoreEntries()" infinite-scroll-disabled="busy || !settingsService.settings.readingMode" infinite-scroll-distance="1" id="feed-accordion"
 		ng-class="{'expanded' : settingsService.settings.viewMode == 'expanded' }">
 		<div ng-show="message && errorCount > 10">${view.error_while_loading_feed} : {{message}}</div>
-		<div ng-repeat="entry in entries" class="entry" scroll-to="navigationMode == 'click' && isOpen && current == entry" scroll-to-offset="-58" 
+		<div ng-repeat="entry in entries" class="entry" scroll-to="navigationMode == 'click' && current == entry" scroll-to-offset="-58" 
 			on-scroll-middle="onScroll(entry)" ng-class="{current: current==entry}">
 			<a href="{{entry.url}}" target="_blank" class="entry-heading" ng-click="noop($event)" ng-mouseup="entryClicked(entry, $event)"
 				ng-class="{open: current == entry, closed: current != entry}">