diff --git a/services/web/app/views/project/editor/review-panel.jade b/services/web/app/views/project/editor/review-panel.jade
index 7690492366..9a7bc4f9a5 100644
--- a/services/web/app/views/project/editor/review-panel.jade
+++ b/services/web/app/views/project/editor/review-panel.jade
@@ -47,14 +47,14 @@
 			.rp-overview-file-header
 				| {{ getFileName(doc_id) }}
 			.rp-entry-wrapper(
-				ng-repeat="(entry_id, entry) in entries"
+				ng-repeat="(entry_id, entry) in entries | orderOverviewEntries"
 			)
 				div(ng-if="entry.type === 'insert' || entry.type === 'delete'")
 					change-entry(
 						entry="entry"
 						user="users[entry.metadata.user_id]"
-						on-reject="rejectChange(entry_id);"
-						on-accept="acceptChange(entry_id);"
+						on-reject="rejectChange(entry.id);"
+						on-accept="acceptChange(entry.id);"
 						on-indicator-click="toggleReviewPanel();"
 						ng-click="gotoEntry(doc_id, entry)"
 					)
@@ -63,9 +63,9 @@
 					comment-entry(
 						entry="entry"
 						users="users"
-						on-resolve="resolveComment(entry, entry_id)"
-						on-unresolve="unresolveComment(entry_id)"
-						on-delete="deleteComment(entry_id)"
+						on-resolve="resolveComment(entry, entry.id)"
+						on-unresolve="unresolveComment(entry.id)"
+						on-delete="deleteComment(entry.id)"
 						on-reply="submitReply(entry, entry_id);"
 						on-indicator-click="toggleReviewPanel();"
 						ng-click="gotoEntry(doc_id, entry)"
diff --git a/services/web/public/coffee/ide/review-panel/ReviewPanelManager.coffee b/services/web/public/coffee/ide/review-panel/ReviewPanelManager.coffee
index d6a065f499..494d5cf2f8 100644
--- a/services/web/public/coffee/ide/review-panel/ReviewPanelManager.coffee
+++ b/services/web/public/coffee/ide/review-panel/ReviewPanelManager.coffee
@@ -4,4 +4,5 @@ define [
 	"ide/review-panel/directives/changeEntry"
 	"ide/review-panel/directives/commentEntry"
 	"ide/review-panel/directives/addCommentEntry"
+	"ide/review-panel/filters/orderOverviewEntries"
 ], () ->
\ No newline at end of file
diff --git a/services/web/public/coffee/ide/review-panel/filters/orderOverviewEntries.coffee b/services/web/public/coffee/ide/review-panel/filters/orderOverviewEntries.coffee
new file mode 100644
index 0000000000..ec0b3da5ce
--- /dev/null
+++ b/services/web/public/coffee/ide/review-panel/filters/orderOverviewEntries.coffee
@@ -0,0 +1,11 @@
+define [
+	"base"
+], (App) ->
+	App.filter "orderOverviewEntries", () ->
+		(items) ->
+			array = []
+			for key, value of items
+				value.entry_id = key
+				array.push value
+			array.sort (a, b) -> a.offset - b.offset
+			return array