diff --git a/Clover/app/src/main/java/org/floens/chan/core/saver/ImageSaver.java b/Clover/app/src/main/java/org/floens/chan/core/saver/ImageSaver.java
index 4bf34ff6..ef99fb31 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/saver/ImageSaver.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/saver/ImageSaver.java
@@ -123,9 +123,9 @@ public class ImageSaver implements ImageSaveTask.ImageSaveTaskCallback {
 
     public File getSaveLocation(ImageSaveTask task) {
         String base = ChanSettings.saveLocation.get();
-        String boardName = task.getSubFolder();
-        if (boardName != null) {
-            return new File(base + File.separator + boardName);
+        String subFolder = task.getSubFolder();
+        if (subFolder != null) {
+            return new File(base + File.separator + subFolder);
         } else {
             return new File(base);
         }
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java
index 3141ec03..aae27e12 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java
@@ -69,6 +69,7 @@ import org.floens.chan.ui.view.TransitionImageView;
 import org.floens.chan.utils.AndroidUtils;
 import org.floens.chan.utils.Logger;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -250,7 +251,9 @@ public class ImageViewerController extends Controller implements ImageViewerPres
             ImageSaveTask task = new ImageSaveTask(postImage);
             task.setShare(share);
             if (ChanSettings.saveBoardFolder.get()) {
-                task.setSubFolder(presenter.getLoadable().boardCode);
+                task.setSubFolder(presenter.getLoadable().site.name() +
+                        File.separator +
+                        presenter.getLoadable().boardCode);
             }
             ImageSaver.getInstance().startDownloadTask(context, task);
         }