diff --git a/Application/FileConverter/ConversionJobs/ConversionJobFactory.cs b/Application/FileConverter/ConversionJobs/ConversionJobFactory.cs
index 9791a66..7b20167 100644
--- a/Application/FileConverter/ConversionJobs/ConversionJobFactory.cs
+++ b/Application/FileConverter/ConversionJobs/ConversionJobFactory.cs
@@ -43,8 +43,9 @@ namespace FileConverter.ConversionJobs
                 return new ConversionJob_ImageMagick(conversionPreset, inputFilePath);
             }
 
-            if (Helpers.GetExtensionCategory(inputFileExtension) == Helpers.InputCategoryNames.Image ||
-                Helpers.GetExtensionCategory(inputFileExtension) == Helpers.InputCategoryNames.Document)
+            if (conversionPreset.OutputType == OutputType.Jpg ||
+                conversionPreset.OutputType == OutputType.Png ||
+                conversionPreset.OutputType == OutputType.Webp)
             {
                 return new ConversionJob_ImageMagick(conversionPreset, inputFilePath);
             }
diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs b/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs
index 06a8806..5bab71f 100644
--- a/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs
+++ b/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs
@@ -86,6 +86,12 @@ namespace FileConverter.ConversionJobs
                         readSettings.Format = MagickFormat.Dng;
                         break;
 
+                    case ".gif":
+                        // Get the first frame of the gif for conversion.
+                        // Maybe in the future make this user selectable.
+                        readSettings.FrameIndex = 0;
+                        break;
+
                     default:
                         break;
                 }
diff --git a/Application/FileConverter/Helpers.cs b/Application/FileConverter/Helpers.cs
index 0b24bd9..b119ba0 100644
--- a/Application/FileConverter/Helpers.cs
+++ b/Application/FileConverter/Helpers.cs
@@ -216,7 +216,7 @@ namespace FileConverter
                 case OutputType.Jpg:
                 case OutputType.Png:
                 case OutputType.Webp:
-                    return category == InputCategoryNames.Image || category == InputCategoryNames.Document;
+                    return category == InputCategoryNames.Image || category == InputCategoryNames.Document || category == InputCategoryNames.AnimatedImage;
 
                 case OutputType.Gif:
                     return category == InputCategoryNames.Image || category == InputCategoryNames.Video || category == InputCategoryNames.AnimatedImage;
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f18669..a972a4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Next Version
 
 - New: Option to use NVidia hardware acceleration for mp4 video (thanks to tacheometry).
+- New: Add Gif to Image conversion support (issue #433, #115) (thanks to RTnhN)
 - New: Persian translation (thanks to MrHero118 and Mehrdad32).
 - New: Serbian translation (thanks to crnobog69).
 - New: Japanese translation (thanks to oogamiyuta).