         makeIconMatrix()
 
         // Show the icon matrix
-        if let asender = (sender as? FFIconButton) {
-            iconPopover!.show(relativeTo: asender.bounds, of: asender, preferredEdge: NSRectEdge.maxY)
-
+        if let iconButton = (sender as? FFIconButton) {
             // Make sure the matrix controller knows which button was clicked on
-            iconPopoverController.button = asender
+            iconPopoverController.button = iconButton
+
+            // Show the popover
+            iconPopover!.show(relativeTo: iconButton.bounds, of: iconButton, preferredEdge: NSRectEdge.maxY)
         }
     }
 


        if !gameInProgress || player == nil { return }

        let flag = NSEvent.modifierFlags.contains(.control)

        if let stepper = (sender as? NSStepper) {
            let stepperValue = stepper.integerValue
            var psf = player!.fear + stepperValue

            if !flag && psf > player!.maxFear { psf = player!.maxFear }
            if flag && psf > 12 { psf = 12 }
            if psf < 0 { psf = 0 }

            if (psf != player!.fear) {
                needToSave = true
                player!.fear = psf

			// Remove the item from the pack, and the item's icon index
			zplayer.pack.remove(at: zplayer.packSelectedItem)

            // Update the table
			packTable.reloadData()
			packTable.needsDisplay = true

