diff --git a/Modules/Disk/popup.swift b/Modules/Disk/popup.swift
index c8831a79..4cf42d9d 100644
--- a/Modules/Disk/popup.swift
+++ b/Modules/Disk/popup.swift
@@ -242,7 +242,7 @@ internal class DiskNameAndBarView: NSView {
     
     override func mouseDown(with: NSEvent) {
         if let uri = self.uri {
-            NSWorkspace.shared.openFile(uri.absoluteString, withApplication: "Finder")
+            NSWorkspace.shared.openFile(uri.path, withApplication: "Finder")
         }
     }
 }
diff --git a/Modules/Disk/readers.swift b/Modules/Disk/readers.swift
index d4d3dac4..8885de01 100644
--- a/Modules/Disk/readers.swift
+++ b/Modules/Disk/readers.swift
@@ -46,7 +46,7 @@ internal class CapacityReader: Reader<DiskList> {
                                 }
                                 
                                 if let path = self.disks.list[idx].path {
-                                    self.disks.list[idx].free = self.freeDiskSpaceInBytes(path.absoluteString)
+                                    self.disks.list[idx].free = self.freeDiskSpaceInBytes(path)
                                     self.driveStats(self.disks.list[idx].parent, &self.disks.list[idx].stats)
                                 }
                             }
@@ -115,17 +115,17 @@ internal class CapacityReader: Reader<DiskList> {
                     d.connectionType = deviceProtocol as! String
                 }
                 if let volumePath = dict[kDADiskDescriptionVolumePathKey as String] {
-                    let url = volumePath as? NSURL
-                    if url != nil {
-                        if url!.pathComponents!.count > 1 && url!.pathComponents![1] == "Volumes" {
-                            let lastPath: String = (url?.lastPathComponent)!
-                            if lastPath != "" {
-                                d.mediaName = lastPath
-                                d.path = URL(string: "/Volumes/\(lastPath)")
+                    if let url = volumePath as? NSURL {
+                        d.path = url as URL
+                        
+                        if let components = url.pathComponents {
+                            d.root = components.count == 1
+                            
+                            if components.count > 1 && components[1] == "Volumes" {
+                                if let name: String = url.lastPathComponent, name != "" {
+                                    d.mediaName = name
+                                }
                             }
-                        } else if url!.pathComponents!.count == 1 {
-                            d.path = URL(string: "/")
-                            d.root = true
                         }
                     }
                 }
@@ -139,7 +139,9 @@ internal class CapacityReader: Reader<DiskList> {
             return nil
         }
         
-        d.free = freeDiskSpaceInBytes(d.path!.absoluteString)
+        if let path = d.path {
+            d.free = freeDiskSpaceInBytes(path)
+        }
         
         let partitionLevel = d.BSDName.filter { "0"..."9" ~= $0 }.count
         if let parent = self.getDeviceIOParent(DADiskCopyIOMedia(disk), level: Int(partitionLevel)) {
@@ -199,10 +201,9 @@ internal class CapacityReader: Reader<DiskList> {
         return
     }
     
-    private func freeDiskSpaceInBytes(_ path: String) -> Int64 {
-        let fileURL = URL(fileURLWithPath: path)
+    private func freeDiskSpaceInBytes(_ path: URL) -> Int64 {
         do {
-            let values = try fileURL.resourceValues(forKeys: [.volumeAvailableCapacityForImportantUsageKey])
+            let values = try path.resourceValues(forKeys: [.volumeAvailableCapacityForImportantUsageKey])
             if let capacity = values.volumeAvailableCapacityForImportantUsage {
                 return capacity
             }
@@ -211,7 +212,7 @@ internal class CapacityReader: Reader<DiskList> {
         }
         
         do {
-            let systemAttributes = try FileManager.default.attributesOfFileSystem(forPath: path)
+            let systemAttributes = try FileManager.default.attributesOfFileSystem(forPath: path.path)
             if let freeSpace = (systemAttributes[FileAttributeKey.systemFreeSize] as? NSNumber)?.int64Value {
                 return freeSpace
             }