diff --git a/frontend/src/hooks/useToolManagement.tsx b/frontend/src/hooks/useToolManagement.tsx
index 5a71c882d..7bc15235c 100644
--- a/frontend/src/hooks/useToolManagement.tsx
+++ b/frontend/src/hooks/useToolManagement.tsx
@@ -2,6 +2,7 @@ import React, { useState, useCallback, useMemo, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import ContentCutIcon from "@mui/icons-material/ContentCut";
 import ZoomInMapIcon from "@mui/icons-material/ZoomInMap";
+import SwapHorizIcon from "@mui/icons-material/SwapHoriz";
 import { useMultipleEndpointsEnabled } from "./useEndpointConfig";
 import { Tool, ToolDefinition, BaseToolProps, ToolRegistry } from "../types/tool";
 
@@ -26,6 +27,15 @@ const toolDefinitions: Record<string, ToolDefinition> = {
     description: "Reduce PDF file size",
     endpoints: ["compress-pdf"]
   },
+  convert: {
+  id: "convert",
+  icon: <SwapHorizIcon />,
+  component: React.lazy(() => import("../tools/Convert")),
+  maxFiles: -1,
+  category: "manipulation",
+  description: "Change to and from PDF and other formats",
+  endpoints: ["pdf-to-img", "img-to-pdf", "pdf-to-word", "pdf-to-presentation", "pdf-to-text", "pdf-to-html", "pdf-to-xml", "html-to-pdf", "markdown-to-pdf", "file-to-pdf"]
+  },
 
 };
 
diff --git a/frontend/src/tools/Convert.tsx b/frontend/src/tools/Convert.tsx
index d58d2f29e..7f490a46e 100644
--- a/frontend/src/tools/Convert.tsx
+++ b/frontend/src/tools/Convert.tsx
@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import DownloadIcon from "@mui/icons-material/Download";
 import { useEndpointEnabled } from "../hooks/useEndpointConfig";
 import { useFileContext } from "../contexts/FileContext";
+import { useToolFileSelection } from "../contexts/FileSelectionContext";
 
 import ToolStep, { ToolStepContainer } from "../components/tools/shared/ToolStep";
 import OperationButton from "../components/tools/shared/OperationButton";
@@ -15,15 +16,12 @@ import ConvertSettings from "../components/tools/convert/ConvertSettings";
 
 import { useConvertParameters } from "../hooks/tools/convert/useConvertParameters";
 import { useConvertOperation } from "../hooks/tools/convert/useConvertOperation";
+import { BaseToolProps } from "../types/tool";
 
-interface ConvertProps {
-  selectedFiles?: File[];
-  onPreviewFile?: (file: File | null) => void;
-}
-
-const Convert = ({ selectedFiles = [], onPreviewFile }: ConvertProps) => {
+const Convert = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
   const { t } = useTranslation();
   const { setCurrentMode } = useFileContext();
+  const { selectedFiles } = useToolFileSelection();
 
   const convertParams = useConvertParameters();
   const convertOperation = useConvertOperation();
@@ -50,10 +48,19 @@ const Convert = ({ selectedFiles = [], onPreviewFile }: ConvertProps) => {
   }, [convertParams.parameters, selectedFiles]);
 
   const handleConvert = async () => {
-    await convertOperation.executeOperation(
-      convertParams.parameters,
-      selectedFiles
-    );
+    try {
+      await convertOperation.executeOperation(
+        convertParams.parameters,
+        selectedFiles
+      );
+      if (convertOperation.files && onComplete) {
+        onComplete(convertOperation.files);
+      }
+    } catch (error) {
+      if (onError) {
+        onError(error instanceof Error ? error.message : 'Convert operation failed');
+      }
+    }
   };
 
   const handleThumbnailClick = (file: File) => {