diff --git a/src/EditableNSTextField.swift b/src/EditableNSTextField.swift
index d7a06bf..491f850 100644
--- a/src/EditableNSTextField.swift
+++ b/src/EditableNSTextField.swift
@@ -9,41 +9,42 @@ final class EditableNSTextField: NSTextField {
     weak var auxiliaryDelegate: EditableNSTextFieldDelegate?
 
     override func performKeyEquivalent(with event: NSEvent) -> Bool {
-        if event.type == NSEvent.EventType.keyDown {
-            let modifiers = event.modifierFlags.rawValue
-            let key = event.keyCode
+        let modifiers = event.modifierFlags.rawValue
+        let key = event.keyCode
 
+        if event.type == NSEvent.EventType.keyDown {
             if modsContains(keys: OSCmd, in: modifiers) {
                 if key == kVK_ANSI_X {
                     if NSApp.sendAction(#selector(NSText.cut(_:)),
-                        to: nil, from: self)
+                                        to: nil, from: self)
                     { return true }
                 } else if key == kVK_ANSI_C {
                     if NSApp.sendAction(#selector(NSText.copy(_:)),
-                        to: nil, from: self)
+                                        to: nil, from: self)
                     { return true }
                 } else if key == kVK_ANSI_V {
                     if NSApp.sendAction(#selector(NSText.paste(_:)),
-                        to: nil, from: self)
+                                        to: nil, from: self)
                     { return true }
                 } else if key == kVK_ANSI_Z {
                     if NSApp.sendAction(Selector(("undo:")),
-                        to: nil, from: self)
+                                        to: nil, from: self)
                     { return true }
                 } else if key == kVK_ANSI_A {
                     if NSApp.sendAction(
                         #selector(NSResponder.selectAll(_:)), to: nil,
-                        from: self)
+                                  from: self)
                     { return true }
                 }
             } else if modsContains(keys: OSCmd | OSShift, in: modifiers) {
                 if key == kVK_ANSI_Z {
                     if NSApp.sendAction(Selector(("redo:")), to: nil,
-                        from: self)
+                                        from: self)
                     { return true }
                 }
             }
         }
+
         return super.performKeyEquivalent(with: event)
     }
 
diff --git a/src/PathsTableCellView.swift b/src/PathsTableCellView.swift
index 046c9cc..335ec49 100644
--- a/src/PathsTableCellView.swift
+++ b/src/PathsTableCellView.swift
@@ -28,7 +28,7 @@ class PathsTableCellView: NSTableCellView, NSTextFieldDelegate,
     var selectionButton: NSButton = {
         let button = NSButton()
         button.image = systemImage("hand.point.up.fill", .headline, .large,
-            .init(paletteColors: [.white, .systemRed]))
+            .init(paletteColors: [.labelColor, .systemRed]))
         button.isBordered = false
         button.sizeToFit()
         button.toolTip = "Select Path"