diff --git a/libs/remix-ui/workspace/src/lib/contexts/index.ts b/libs/remix-ui/workspace/src/lib/contexts/index.ts
index 1bd33c2529..b71dc9e373 100644
--- a/libs/remix-ui/workspace/src/lib/contexts/index.ts
+++ b/libs/remix-ui/workspace/src/lib/contexts/index.ts
@@ -4,7 +4,7 @@ import { BrowserState } from '../reducers/workspace'
 
 export const FileSystemContext = createContext<{
   fs: BrowserState,
-  modal:(title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
+  modal:(title: string | JSX.Element, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
   dispatchInitWorkspace:() => Promise<void>,
   dispatchFetchDirectory:(path: string) => Promise<void>,
   dispatchAddInputField:(path: string, type: 'file' | 'folder') => Promise<void>,
diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
index 623c2cac15..0b77c8165c 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -1,7 +1,6 @@
 import React, { useState, useEffect, useRef, useContext } from 'react' // eslint-disable-line
 import { FileExplorer } from './components/file-explorer' // eslint-disable-line
 import { FileSystemContext } from './contexts'
-import { TooltipPopup } from '@remix-ui/tooltip-popup'
 import './css/remix-ui-workspace.css'
 
 const canUpload = window.File || window.FileReader || window.FileList || window.Blob
@@ -53,6 +52,10 @@ export function Workspace () {
     global.modal('Delete Current Workspace', 'Are you sure to delete the current workspace?', 'OK', onFinishDeleteWorkspace, '')
   }
 
+  const cloneGitRepository = () => {
+    global.modal('Clone Git Repository', cloneModalMessage(), 'OK', handleTypingUrl, '')
+  }
+
   const downloadWorkspaces = async () => {
     try {
       await global.dispatchHandleDownloadFiles()
@@ -126,15 +129,13 @@ export function Workspace () {
     workspaceCreateInput.current.value = `${workspaceCreateTemplateInput.current.value || 'remixDefault'}_${Date.now()}`
   }
 
-  const handleTypingUrl = (event: React.KeyboardEvent<HTMLInputElement>) => {
-    if (event.key === 'Enter') {
-      const url = cloneUrlRef.current.value
+  const handleTypingUrl = () => {
+    const url = cloneUrlRef.current.value
 
-      if (url) {
-        global.dispatchCloneRepository(url)
-      } else {
-        console.log('Please provide a valid github repository url.')
-      }
+    if (url) {
+      global.dispatchCloneRepository(url)
+    } else {
+      global.modal('Create Workspace', 'Please provide a valid github repository url.', 'OK', () => {}, '')
     }
   }
 
@@ -163,6 +164,14 @@ export function Workspace () {
     )
   }
 
+  const cloneModalMessage = () => {
+    return (
+      <>
+        <input type="text" data-id="modalDialogCustomPromptTextClone" placeholder='Enter git repository url' ref={cloneUrlRef} className="form-control" />
+      </>
+    )
+  }
+
   return (
     <div className='remixui_container'>
       <div className='remixui_fileexplorer' data-id="remixUIWorkspaceExplorer" onClick={resetFocus}>
@@ -228,17 +237,16 @@ export function Workspace () {
                     className='far fa-upload remixui_menuicon'
                     title='Restore Workspaces Backup'>
                   </span>
-                  <TooltipPopup icon='fas fa-cloud-download' title='Clone Repository'>
-                    <div className="remixui_cloneContainer">
-                      <input
-                        ref={cloneUrlRef}
-                        className="form-control"
-                        placeholder="Enter github repository url"
-                        title="Enter github repository url"
-                        onKeyDown={handleTypingUrl}
-                      />
-                    </div>
-                  </TooltipPopup>
+                  <span
+                    id='cloneGitRepository'
+                    data-id='cloneGitRepository'
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      cloneGitRepository()
+                    }}
+                    className='far fa-clone remixui_menuicon'
+                    title='Clone Git Repository'>
+                  </span>
                 </span>
               <select id="workspacesSelect" value={currentWorkspace} data-id="workspacesSelect" onChange={(e) => switchWorkspace(e.target.value)} className="form-control custom-select">
                 {