diff --git a/macosx/Controller.m b/macosx/Controller.m
index 897d84265..f3dca2a8c 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -99,6 +99,13 @@ typedef enum
     SORT_ACTIVITY_TAG = 6
 } sortTag;
 
+typedef enum
+{
+    SORT_ASC_TAG = 0,
+    SORT_DESC_TAG = 1
+} sortOrderTag;
+
+
 #define FILTER_NONE     @"None"
 #define FILTER_ACTIVE   @"Active"
 #define FILTER_DOWNLOAD @"Download"
@@ -2057,8 +2064,12 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
 - (void) setSortReverse: (id) sender
 {
-    [fDefaults setBool: ![fDefaults boolForKey: @"SortReverse"] forKey: @"SortReverse"];
-    [self sortTorrents];
+    const BOOL setReverse = [sender tag] == SORT_DESC_TAG;
+    if (setReverse != [fDefaults boolForKey: @"SortReverse"])
+    {
+        [fDefaults setBool: setReverse forKey: @"SortReverse"];
+        [self sortTorrents];
+    }
 }
 
 - (void) sortTorrents
@@ -4021,7 +4032,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     //enable reverse sort item
     if (action == @selector(setSortReverse:))
     {
-        [menuItem setState: [fDefaults boolForKey: @"SortReverse"] ? NSOnState : NSOffState];
+        const BOOL isReverse = [menuItem tag] == SORT_DESC_TAG;
+        [menuItem setState: (isReverse == [fDefaults boolForKey: @"SortReverse"]) ? NSOnState : NSOffState];
         return ![[fDefaults stringForKey: @"Sort"] isEqualToString: SORT_ORDER];
     }
     
diff --git a/macosx/en.lproj/MainMenu.xib b/macosx/en.lproj/MainMenu.xib
index f8c278cb4..664973c0d 100644
--- a/macosx/en.lproj/MainMenu.xib
+++ b/macosx/en.lproj/MainMenu.xib
@@ -13,8 +13,8 @@
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="2"/>
-			<integer value="1895"/>
 			<integer value="1639"/>
+			<integer value="1895"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1325,13 +1325,23 @@ AAAAAAAAAAAAAAAAA</bytes>
 											</object>
 											<object class="NSMenuItem" id="499215618">
 												<reference key="NSMenu" ref="188604546"/>
-												<string key="NSTitle">Reverse Sort Order</string>
+												<string key="NSTitle">Ascending</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSKeyEquivModMask">1048576</int>
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="322614661"/>
 												<reference key="NSMixedImage" ref="3851078"/>
 											</object>
+											<object class="NSMenuItem" id="254573946">
+												<reference key="NSMenu" ref="188604546"/>
+												<string key="NSTitle">Descending</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="322614661"/>
+												<reference key="NSMixedImage" ref="3851078"/>
+												<int key="NSTag">1</int>
+											</object>
 										</object>
 									</object>
 								</object>
@@ -2332,7 +2342,7 @@ AAAAAAAAAAAAAAAAA</bytes>
 				<string key="NSExtension">NSView</string>
 			</object>
 			<object class="NSCustomView" id="793806362">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">266</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2341,7 +2351,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 						<int key="NSvFlags">257</int>
 						<string key="NSFrame">{{357, 4}, {95, 15}}</string>
 						<reference key="NSSuperview" ref="793806362"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSSearchFieldCell" key="NSCell" id="186597542">
 							<int key="NSCellFlags">343014976</int>
@@ -2411,7 +2420,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{42, 2}, {30, 17}}</string>
 						<reference key="NSSuperview" ref="793806362"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="724632485">
 							<int key="NSCellFlags">67239488</int>
@@ -2436,7 +2444,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{123, 2}, {89, 17}}</string>
 						<reference key="NSSuperview" ref="793806362"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="494573874">
 							<int key="NSCellFlags">67239488</int>
@@ -2457,7 +2464,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{213, 2}, {59, 17}}</string>
 						<reference key="NSSuperview" ref="793806362"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="938004552">
 							<int key="NSCellFlags">67239488</int>
@@ -2478,7 +2484,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{273, 2}, {55, 17}}</string>
 						<reference key="NSSuperview" ref="793806362"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="371449771">
 							<int key="NSCellFlags">67239488</int>
@@ -2499,7 +2504,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{34, 5}, {5, 12}}</string>
 						<reference key="NSSuperview" ref="793806362"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -2522,7 +2526,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{5, 4}, {26, 14}}</string>
 						<reference key="NSSuperview" ref="793806362"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="189668006">
 							<int key="NSCellFlags">-2076049856</int>
@@ -2593,7 +2596,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{73, 2}, {49, 17}}</string>
 						<reference key="NSSuperview" ref="793806362"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="745428997">
 							<int key="NSCellFlags">67239488</int>
@@ -2611,8 +2613,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 					</object>
 				</object>
 				<string key="NSFrameSize">{457, 23}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<string key="NSClassName">FilterBarView</string>
 				<string key="NSExtension">NSView</string>
 			</object>
@@ -2864,13 +2864,23 @@ AAAAAAAAAAAAAAAAA</bytes>
 								</object>
 								<object class="NSMenuItem" id="751635815">
 									<reference key="NSMenu" ref="995409894"/>
-									<string key="NSTitle">Reverse Sort Order</string>
+									<string key="NSTitle">Ascending</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="322614661"/>
 									<reference key="NSMixedImage" ref="3851078"/>
 								</object>
+								<object class="NSMenuItem" id="350087065">
+									<reference key="NSMenu" ref="995409894"/>
+									<string key="NSTitle">Descending</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="322614661"/>
+									<reference key="NSMixedImage" ref="3851078"/>
+									<int key="NSTag">1</int>
+								</object>
 							</object>
 						</object>
 					</object>
@@ -4998,6 +5008,22 @@ AAAAAAAAAAAAAAAAA</bytes>
 					</object>
 					<int key="connectionID">3402</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setSortReverse:</string>
+						<reference key="source" ref="30116300"/>
+						<reference key="destination" ref="350087065"/>
+					</object>
+					<int key="connectionID">3404</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setSortReverse:</string>
+						<reference key="source" ref="30116300"/>
+						<reference key="destination" ref="254573946"/>
+					</object>
+					<int key="connectionID">3406</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -5483,6 +5509,7 @@ AAAAAAAAAAAAAAAAA</bytes>
 							<reference ref="680215502"/>
 							<reference ref="204564835"/>
 							<reference ref="315432362"/>
+							<reference ref="254573946"/>
 						</object>
 						<reference key="parent" ref="869366887"/>
 					</object>
@@ -6117,10 +6144,11 @@ AAAAAAAAAAAAAAAAA</bytes>
 							<reference ref="1033072898"/>
 							<reference ref="567343578"/>
 							<reference ref="711642878"/>
-							<reference ref="751635815"/>
 							<reference ref="929487025"/>
 							<reference ref="637483698"/>
 							<reference ref="187354483"/>
+							<reference ref="751635815"/>
+							<reference ref="350087065"/>
 						</object>
 						<reference key="parent" ref="129280366"/>
 					</object>
@@ -7071,6 +7099,16 @@ AAAAAAAAAAAAAAAAA</bytes>
 						<reference key="object" ref="1032356165"/>
 						<reference key="parent" ref="770683227"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3403</int>
+						<reference key="object" ref="350087065"/>
+						<reference key="parent" ref="995409894"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3405</int>
+						<reference key="object" ref="254573946"/>
+						<reference key="parent" ref="188604546"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -7636,6 +7674,10 @@ AAAAAAAAAAAAAAAAA</bytes>
 					<string>3321.IBPluginDependency</string>
 					<string>3322.IBPluginDependency</string>
 					<string>3400.IBPluginDependency</string>
+					<string>3403.IBPluginDependency</string>
+					<string>3403.ImportedFromIB2</string>
+					<string>3405.IBPluginDependency</string>
+					<string>3405.ImportedFromIB2</string>
 					<string>418.IBPluginDependency</string>
 					<string>418.ImportedFromIB2</string>
 					<string>456.IBEditorWindowLastContentRect</string>
@@ -7846,7 +7888,7 @@ AAAAAAAAAAAAAAAAA</bytes>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{481, 314}, {194, 173}}</string>
+					<string>{{481, 294}, {154, 193}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{286, 514}, {197, 173}}</string>
@@ -7953,7 +7995,7 @@ AAAAAAAAAAAAAAAAA</bytes>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{820, 618}, {194, 173}}</string>
+					<string>{{820, 598}, {154, 193}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{449, 701}, {197, 173}}</string>
@@ -8254,6 +8296,10 @@ AAAAAAAAAAAAAAAAA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<integer value="1"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<integer value="1"/>
 					<string>{{586, 242}, {291, 313}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
@@ -8322,7 +8368,7 @@ AAAAAAAAAAAAAAAAA</bytes>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">3402</int>
+			<int key="maxID">3406</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">