diff --git a/ChanSort/MainForm.cs b/ChanSort/MainForm.cs
index bffa37e..6df2e50 100644
--- a/ChanSort/MainForm.cs
+++ b/ChanSort/MainForm.cs
@@ -987,7 +987,7 @@ namespace ChanSort.Ui
     private void NavigateToChannel(ChannelInfo channel, GridView view)
     {
       if (channel == null) return;
-      int rowHandle = this.gviewRight.GetRowHandle(this.currentChannelList.Channels.IndexOf(channel));
+      int rowHandle = view.GetRowHandle(this.currentChannelList.Channels.IndexOf(channel));
       if (view.IsValidRowHandle(rowHandle))
       {
         this.SelectFocusedRow(view, rowHandle);
diff --git a/makeDistribZip.cmd b/makeDistribZip.cmd
index ea02ade..036ccad 100644
--- a/makeDistribZip.cmd
+++ b/makeDistribZip.cmd
@@ -17,7 +17,7 @@ cd ..
 del Website\ChanSort.zip 2>nul
 copy Source\readme.txt %target%
 cd %target%
-c:\cygwin\bin\date +%Y-%m-%d>%TEMP%\date.txt
+c:\cygwin\bin\date "+%%Y-%%m-%%d">%TEMP%\date.txt
 set /p curdate=<%temp%\date.txt
 "c:\program files (x86)\7-Zip\7z.exe" a -tzip ChanSort_%curdate%.zip *