diff --git a/CHANGELOG.md b/CHANGELOG.md
index c15693fb367..8191faaa89c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,8 @@ to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by
 - Fixed [#803](https://github.com/JabRef/jabref/issues/803): Fixed dynamically group, free-form search
 - Fixed [#743](https://github.com/JabRef/jabref/issues/743): Logger not configured when JAR is started
 - Fixed [#822](https://github.com/JabRef/jabref/issues/822):OSX - Exception when adding the icon to the dock
+- Fixed [#822](https://github.com/JabRef/jabref/issues/822): OSX - Exception when adding the icon to the dock
+- Fixed [#609](https://github.com/JabRef/jabref/issues/609): Sort Arrows are shown in the main table if table is sorted
 - Fixed [#685](https://github.com/JabRef/jabref/issues/685): Fixed MySQL exporting for more than one entry
 - Fixed [#815](https://github.com/JabRef/jabref/issues/815): Curly Braces no longer ignored in OpenOffice/LibreOffice citation
 - Fixed [#855](https://github.com/JabRef/jabref/issues/856): Fixed OpenOffice Manual connect - Clicking on browse does now work correctly
diff --git a/src/main/java/net/sf/jabref/gui/maintable/MainTable.java b/src/main/java/net/sf/jabref/gui/maintable/MainTable.java
index 300a71b1934..ad4bfb2a4c6 100644
--- a/src/main/java/net/sf/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/net/sf/jabref/gui/maintable/MainTable.java
@@ -177,6 +177,9 @@ public MainTable(MainTableFormat tableFormat, EventList<BibEntry> list, JabRefFr
 
         this.tableColumnListener = new PersistenceTableColumnListener(this);
 
+        // set table header render AFTER creation of comparatorChooser (this enables sort arrow rendering)
+        this.getTableHeader().setDefaultRenderer(new MainTableHeaderRenderer(this.getTableHeader().getDefaultRenderer()));
+
         // TODO: Figure out, whether this call is needed.
         getSelected();
 
@@ -189,7 +192,6 @@ public MainTable(MainTableFormat tableFormat, EventList<BibEntry> list, JabRefFr
         setupComparatorChooser();
         refreshSorting();
         setWidths();
-
     }
 
     public void refreshSorting() {