diff --git a/src/pages/Questions/ButtonsOptions.tsx b/src/pages/Questions/ButtonsOptions.tsx
index 4a3f3dc2..dd91ec0d 100644
--- a/src/pages/Questions/ButtonsOptions.tsx
+++ b/src/pages/Questions/ButtonsOptions.tsx
@@ -295,27 +295,26 @@ export default function ButtonsOptions({
         >
           <CopyIcon color={"#4D4D4D"} />
         </IconButton>
-        <IconButton
-          sx={{ borderRadius: "6px", padding: "2px" }}
-          onClick={() => {
-            if (question.type === null) {
-              deleteQuestion(question.id);
-            }
-            if (question.content.rule.parentId.length !== 0) {
-              setOpenDelete(true);
-            } else {
-              deleteQuestionWithTimeout(question.id, () =>
-                DeleteFunction(questions, question, quiz),
-              );
-            }
-          }}
-          data-cy="delete-question"
-        >
-          {(quiz?.config.type !== "form" ||
-            question.id !== questions[0].id) && (
+        {(quiz?.config.type !== "form" || question.id !== questions[0].id) && (
+          <IconButton
+            sx={{ borderRadius: "6px", padding: "2px" }}
+            onClick={() => {
+              if (question.type === null) {
+                deleteQuestion(question.id);
+              }
+              if (question.content.rule.parentId.length !== 0) {
+                setOpenDelete(true);
+              } else {
+                deleteQuestionWithTimeout(question.id, () =>
+                  DeleteFunction(questions, question, quiz),
+                );
+              }
+            }}
+            data-cy="delete-question"
+          >
             <DeleteIcon color={"#4D4D4D"} />
-          )}
-        </IconButton>
+          </IconButton>
+        )}
         <Modal open={openDelete} onClose={() => setOpenDelete(false)}>
           <Box
             sx={{
diff --git a/src/pages/Questions/ButtonsOptionsAndPict.tsx b/src/pages/Questions/ButtonsOptionsAndPict.tsx
index de16b98e..124fdf34 100644
--- a/src/pages/Questions/ButtonsOptionsAndPict.tsx
+++ b/src/pages/Questions/ButtonsOptionsAndPict.tsx
@@ -323,24 +323,26 @@ export default function ButtonsOptionsAndPict({
         >
           <CopyIcon style={{ color: "#4D4D4D" }} />
         </IconButton>
-        <IconButton
-          sx={{ borderRadius: "6px", padding: "2px" }}
-          onClick={() => {
-            if (question.type === null) {
-              deleteQuestion(question.id);
-            }
-            if (question.content.rule.parentId.length !== 0) {
-              setOpenDelete(true);
-            } else {
-              deleteQuestionWithTimeout(question.id, () =>
-                DeleteFunction(questions, question, quiz),
-              );
-            }
-          }}
-          data-cy="delete-question"
-        >
-          <DeleteIcon style={{ color: "#4D4D4D" }} />
-        </IconButton>
+        {(quiz?.config.type !== "form" || question.id !== questions[0].id) && (
+          <IconButton
+            sx={{ borderRadius: "6px", padding: "2px" }}
+            onClick={() => {
+              if (question.type === null) {
+                deleteQuestion(question.id);
+              }
+              if (question.content.rule.parentId.length !== 0) {
+                setOpenDelete(true);
+              } else {
+                deleteQuestionWithTimeout(question.id, () =>
+                  DeleteFunction(questions, question, quiz),
+                );
+              }
+            }}
+            data-cy="delete-question"
+          >
+            <DeleteIcon style={{ color: "#4D4D4D" }} />
+          </IconButton>
+        )}
         <Modal open={openDelete} onClose={() => setOpenDelete(false)}>
           <Box
             sx={{
diff --git a/src/pages/Questions/Form/FormDraggableList/FormDraggableListItem.tsx b/src/pages/Questions/Form/FormDraggableList/FormDraggableListItem.tsx
index 621c5628..fec5cbdf 100644
--- a/src/pages/Questions/Form/FormDraggableList/FormDraggableListItem.tsx
+++ b/src/pages/Questions/Form/FormDraggableList/FormDraggableListItem.tsx
@@ -87,7 +87,7 @@ export const FormItem = ({
 
 export const FormDraggableListItem = memo(
   ({ question, questionIndex }: FormDraggableListItemProps) => (
-    <Draggable draggableId={String(questionIndex)} index={questionIndex}>
+    <Draggable draggableId={String(question.id)} index={questionIndex}>
       {(provided) => (
         <ListItem
           ref={provided.innerRef}
diff --git a/src/pages/Questions/Form/FormDraggableList/index.tsx b/src/pages/Questions/Form/FormDraggableList/index.tsx
index 9f0e264e..0f670568 100644
--- a/src/pages/Questions/Form/FormDraggableList/index.tsx
+++ b/src/pages/Questions/Form/FormDraggableList/index.tsx
@@ -8,7 +8,9 @@ import { useQuestions } from "@root/questions/hooks";
 export const FormDraggableList = () => {
   const questions = useQuestions().questions.filter((q) => q.type !== "result");
   const onDragEnd = ({ destination, source }: DropResult) => {
-    if (destination) reorderQuestions(source.index, destination.index);
+    if (destination) {
+      reorderQuestions(source.index, destination.index);
+    }
   };
 
   return (