diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index e91f5ef..a7a1ed9 100755
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -570,8 +570,8 @@ key_bindings:
   - { key: Insert,   mods: Shift,         action: PasteSelection   }
   - { key: Key0,     mods: Control,       action: ResetFontSize    }
   - { key: Equals,   mods: Control,       action: IncreaseFontSize }
-  - { key: Add,      mods: Control,       action: IncreaseFontSize }
-  - { key: Subtract, mods: Control,       action: DecreaseFontSize }
+  - { key: NumpadAdd,      mods: Control,       action: IncreaseFontSize }
+  - { key: NumpadSubtract, mods: Control,       action: DecreaseFontSize }
   - { key: Minus,    mods: Control,       action: DecreaseFontSize }
 
   - { key: Paste,                    action: Paste                            }
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index e032e67..1f207ef 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -181,8 +181,6 @@ function commits
 end
 
 # Functions needed for !! and !$
-# Will only work in default (emacs) mode.
-# Will NOT work in vi mode.
 function __history_previous_command
   switch (commandline -t)
   case "!"
@@ -202,8 +200,13 @@ function __history_previous_command_arguments
   end
 end
 # The bindings for !! and !$
-bind ! __history_previous_command
-bind '$' __history_previous_command_arguments
+if [ $fish_key_bindings = fish_vi_key_bindings ];
+  bind -Minsert ! __history_previous_command
+  bind -Minsert '$' __history_previous_command_arguments
+else
+  bind ! __history_previous_command
+  bind '$' __history_previous_command_arguments
+end
 
 # Function for creating a backup file
 # ex: backup file.txt