diff --git a/aur-scripts/wofi-calc-git/push-version.sh b/aur-scripts/wofi-calc-git/push-version.sh
index 48d5d1b..ee03fae 100755
--- a/aur-scripts/wofi-calc-git/push-version.sh
+++ b/aur-scripts/wofi-calc-git/push-version.sh
@@ -7,7 +7,7 @@ sed -i "s/^sha256sums=.*/$(makepkg -g -f -p PKGBUILD)/" ./PKGBUILD
 makepkg --printsrcinfo > .SRCINFO
 
 # Push it to AUR
-git add PKGBUILD .SRCINFO
+git add ./PKGBUILD ./.SRCINFO
 git commit -m "New version"
 git push ssh://aur@aur.archlinux.org/wofi-calc-git.git master
 
diff --git a/aur-scripts/wofi-calc-git/wofi-calc.sh b/aur-scripts/wofi-calc-git/wofi-calc.sh
new file mode 100644
index 0000000..72fea60
--- /dev/null
+++ b/aur-scripts/wofi-calc-git/wofi-calc.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+RESULT_FILE="$HOME/.config/qalculate/qalc.result.history"
+if [ ! -f "$RESULT_FILE" ]; then
+  touch $RESULT_FILE
+fi
+
+LAST_WOFI=""
+QALC_RET=""
+while :
+do
+  qalc_hist=`tac $RESULT_FILE | head -1000`
+  WOFI_RET=`wofi --sort-order=default --cache-file=/dev/null -d -p calc <<< "$qalc_hist"`
+
+  rtrn=$?
+
+  if test "$rtrn" = "0"; then
+    if [[ "$WOFI_RET" =~ .*=.* ]]; then
+      RESULT=`echo "$WOFI_RET" | awk {'print $NF'}`
+      wl-copy "$RESULT"
+      exit 0
+    else
+      QALC_RET=`qalc "$WOFI_RET"`
+      LAST_WOFI=$WOFI_RET
+      echo $QALC_RET >> $RESULT_FILE
+    fi
+  else
+    if [ ! -z "$LAST_WOFI" ]; then
+      RESULT=`qalc -t "$LAST_WOFI"`
+      wl-copy "$RESULT"
+    fi
+    exit 0
+  fi
+done