diff --git a/.gitignore b/.gitignore
index f0245a7bbc7..a863ad7f7a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,6 +97,7 @@ res/pics/booster
 res/pics/icons
 res/pics/tokens
 res/quest/data
+res/quest/quest.preferences
 res/quest/questData.dat
 res/quest/questData.dat.xml
 res/reprintSetInfo.log
diff --git a/src/main/java/forge/view/home/QuestFileLister.java b/src/main/java/forge/view/home/QuestFileLister.java
index a0e72e388a3..9dcc7dbbf24 100644
--- a/src/main/java/forge/view/home/QuestFileLister.java
+++ b/src/main/java/forge/view/home/QuestFileLister.java
@@ -5,6 +5,8 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import javax.swing.ImageIcon;
@@ -69,6 +71,14 @@ public class QuestFileLister extends JPanel {
     public void setQuests(QuestData[] qd0) {
         this.removeAll();
         List<RowPanel> tempRows = new ArrayList<RowPanel>();
+        List<QuestData> sorted = new ArrayList<QuestData>();
+        for (QuestData qd : qd0) { sorted.add(qd); }
+        Collections.sort(sorted, new Comparator<QuestData>() {
+            @Override
+            public int compare(final QuestData x, final QuestData y) {
+                return ((QuestData) x).getName().compareTo(((QuestData) y).getName());
+            }
+        });
 
         // Title row
         // Note: careful with the widths of the rows here;
@@ -84,7 +94,7 @@ public class QuestFileLister extends JPanel {
         this.add(rowTitle, "w 98%!, h 30px!, gapleft 1%");
 
         RowPanel row;
-        for (QuestData qd : qd0) {
+        for (QuestData qd : sorted) {
             row = new RowPanel(qd);
             row.add(new DeleteButton(row), "w 15%!, h 20px!, gap 0 0 5px 0");
             row.add(new EditButton(row), "w 15%!, h 20px!, gaptop 5px");
diff --git a/src/main/java/forge/view/home/ViewQuest.java b/src/main/java/forge/view/home/ViewQuest.java
index 890c24c0e5a..75acb46739c 100644
--- a/src/main/java/forge/view/home/ViewQuest.java
+++ b/src/main/java/forge/view/home/ViewQuest.java
@@ -1,6 +1,7 @@
 package forge.view.home;
 
 import java.awt.Color;
+import java.awt.Point;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.File;
@@ -447,6 +448,8 @@ public class ViewQuest extends JScrollPane {
             selectedOpponent = (SelectablePanel) pnlChallenges.getComponent(0);
             selectedOpponent.setBackground(skin.getColor(FSkin.Colors.CLR_ACTIVE));
         }
+
+        this.getViewport().setViewPosition(new Point(0, 0));
     }
 
     /** Display handler for decks tab click. */