diff --git a/src/pages/AddWorkspace/index.tsx b/src/pages/AddWorkspace/index.tsx
index c8c60eec..4ce45220 100644
--- a/src/pages/AddWorkspace/index.tsx
+++ b/src/pages/AddWorkspace/index.tsx
@@ -136,18 +136,6 @@ export function AddWorkspace(): JSX.Element {
           {/* Force it only show sync option when clone online wiki, because many user encounter sync problem here. Recommend them create local first and sync later. */}
           {isCreateSyncedWorkspace && <SyncedWikiDescription isCreateSyncedWorkspace={isCreateSyncedWorkspace} isCreateSyncedWorkspaceSetter={() => {}} />}
           <MainSubWikiDescription isCreateMainWorkspace={isCreateMainWorkspace} isCreateMainWorkspaceSetter={isCreateMainWorkspaceSetter} />
-          {isCreateMainWorkspace && (
-            <LocationPickerContainer>
-              <LocationPickerInput
-                error={errorInWhichComponent.wikiPort}
-                onChange={(event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
-                  form.wikiPortSetter(Number(event.target.value));
-                }}
-                label={t('AddWorkspace.WikiServerPort')}
-                value={wikiPort}
-              />
-            </LocationPickerContainer>
-          )}
         </AccordionDetails>
       </Accordion>
 
diff --git a/src/pages/EditWorkspace/index.tsx b/src/pages/EditWorkspace/index.tsx
index 8cc57cf3..85a923a2 100644
--- a/src/pages/EditWorkspace/index.tsx
+++ b/src/pages/EditWorkspace/index.tsx
@@ -292,6 +292,13 @@ export default function EditWorkspace(): JSX.Element {
             isCreateMainWorkspace={!isSubWiki}
           />
         )}
+        {!isSubWiki && (
+          <>
+            <Divider />
+            <ServerOptions workspace={workspace} workspaceSetter={workspaceSetter} />
+            <Divider />
+          </>
+        )}
         {storageService !== SupportedStorageServices.local && (
           <>
             <List>
@@ -403,13 +410,6 @@ export default function EditWorkspace(): JSX.Element {
             }}
           />
         )}
-        {!isSubWiki && (
-          <>
-            <Divider />
-            <ServerOptions workspace={workspace} workspaceSetter={workspaceSetter} />
-            <Divider />
-          </>
-        )}
       </FlexGrow>
       {!isEqual(workspace, originalWorkspace) && (
         <SaveCancelButtonsContainer>
diff --git a/src/pages/EditWorkspace/server.tsx b/src/pages/EditWorkspace/server.tsx
index c6afc355..a0b48077 100644
--- a/src/pages/EditWorkspace/server.tsx
+++ b/src/pages/EditWorkspace/server.tsx
@@ -79,7 +79,7 @@ export function ServerOptions(props: IServerOptionsProps) {
     <AServerOptionsAccordion defaultExpanded={alreadyEnableSomeServerOptions}>
       <Tooltip title={t('EditWorkspace.ClickToExpand')}>
         <AServerOptionsAccordionSummary expandIcon={<ExpandMoreIcon />}>
-          {t('EditWorkspace.ServerOptions')}
+          {t('EditWorkspace.ServerOptions')} ({t('EditWorkspace.EnableHTTPAPI')})
         </AServerOptionsAccordionSummary>
       </Tooltip>
       <AccordionDetails>