diff --git a/YAPS/YAPS/ContentView.swift b/YAPS/YAPS/ContentView.swift
index e848605..a2b18cc 100644
--- a/YAPS/YAPS/ContentView.swift
+++ b/YAPS/YAPS/ContentView.swift
@@ -34,13 +34,7 @@ struct ContentView: View {
               .onTapGesture(perform: {
                 print("pressed \(yapsFile.name)")
                 
-                self.previewImg = FinderHelper.shared.getImageByURL(source: yapsFile.file)
-                  .resizable()
-                
-                Shared.shared.currentFile = yapsFile
-                
-                self.resetCurrentFile()
-                self.fileList[yapsFile.index].current = true
+                self.setCurrentFile(newCurrent: yapsFile, at: yapsFile.index)
               })
           }
         }
@@ -58,14 +52,7 @@ struct ContentView: View {
             newIndex += 0
           }
           
-          let currentFile = self.fileList[newIndex]
-          
-          Shared.shared.currentFile = currentFile
-          
-          self.resetCurrentFile()
-          self.fileList[newIndex].current = true
-          
-          self.previewImg = FinderHelper.shared.getImageByURL(source: self.fileList[newIndex].file)
+          self.setCurrentFile(newCurrent: self.fileList[newIndex], at: newIndex)
         }
       }
       .frame(width: 200.0)
@@ -88,6 +75,17 @@ struct ContentView: View {
   }
   
   
+  func setCurrentFile(newCurrent: YapsFile, at: Int) {
+    let currentFile = self.fileList[at]
+    
+    Shared.shared.currentFile = currentFile
+    
+    self.resetCurrentFile()
+    self.fileList[at].current = true
+    
+    self.previewImg = FinderHelper.shared.getImageByURL(source: self.fileList[at].file)
+  }
+  
   func checkCurrentFile(yapsFile: YapsFile) -> Bool {
     let result: Bool = (Shared.shared.currentFile.index == yapsFile.index)
     if result {