diff --git a/scripts/create_app_image.sh b/scripts/create_app_image.sh
index f859388..271097d 100644
--- a/scripts/create_app_image.sh
+++ b/scripts/create_app_image.sh
@@ -8,7 +8,7 @@ BASE_DIR=$(pwd)
 
 mkdir -p $TOOL_DIR
 
-if ls $TOOL_DIR/*.AppImage 1> /dev/null 2>&1; then
+if ls $TOOL_DIR/linuxdeploy*.AppImage 1> /dev/null 2>&1; then
   echo "Skipping download of linuxdeploy"
 else
   echo "Downloading linuxdeploy tool"
@@ -16,6 +16,14 @@ else
   chmod +x $TOOL_DIR/linuxdeploy*.AppImage
 fi
 
+if ls $TOOL_DIR/appimagetool*.AppImage 1> /dev/null 2>&1; then
+  echo "Skipping download of appimagetool"
+else
+  echo "Downloading appimagetool"
+  wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -P "$TOOL_DIR"
+  chmod +x $TOOL_DIR/appimagetool*.AppImage
+fi
+
 rm -Rf "$TARGET_DIR"
 mkdir -p $OUTPUT_DIR
 mkdir -p $BUILD_DIR
@@ -29,4 +37,16 @@ $TOOL_DIR/linuxdeploy*.AppImage --appimage-extract-and-run -e "$BASE_DIR/$EXEC_P
   --appdir $BUILD_DIR \
   --output appimage
 chmod +x ./Espanso*.AppImage
+
+# Apply a workaround to fix this issue: https://github.com/federico-terzi/espanso/issues/900
+# See: https://github.com/project-slippi/Ishiiruka/issues/323#issuecomment-977415376
+
+echo "Applying patch for libgmodule"
+
+./Espanso*.AppImage --appimage-extract
+rm -Rf ./Espanso*.AppImage
+rm -Rf squashfs-root/usr/lib/libgmodule*
+$TOOL_DIR/appimagetool*.AppImage -v squashfs-root
+rm -Rf squashfs-root
+
 popd
\ No newline at end of file