diff --git a/src/edit/src/editor.cpp b/src/edit/src/editor.cpp
index 36c69176ff9f466163f6cca81eeb1c0cb7ed5566..d2c8c440c2ec672131da9d64deac4702a1a55e75 100644
--- a/src/edit/src/editor.cpp
+++ b/src/edit/src/editor.cpp
@@ -258,6 +258,9 @@ void Editor::resetBuildModeIIVariables()
     can_connect_modules = true;
     selected_space_joints = {};
 
+    connector_selected = false;
+    voxel_selected = false;
+
     scene->manageSelection(nullptr);
     scene->manageHighlight(glm::vec3(0.0f), nullptr);
     scene->manageSecondarySelection({});
diff --git a/src/gui/src/ui.cpp b/src/gui/src/ui.cpp
index 7f2b3f03a2c3dddaac85691292119eb3e1f92887..9b4a140939790a34a827bad106b245c3fd8eb334 100644
--- a/src/gui/src/ui.cpp
+++ b/src/gui/src/ui.cpp
@@ -879,7 +879,7 @@ void module_rotation_manual(edit::UIData &data, glm::vec3 &euler_angles)
 
 void component_rotation_ui(const osi::Window &window, edit::UIData &data)
 {
-    if (data.editor_build_mode_II != edit::build_mode_II::rotate_component || !(data.voxel_selected || data.connector_selected))
+    if (data.editor_build_mode_II != edit::build_mode_II::rotate_component || !data.selected_module || !(data.voxel_selected || data.connector_selected))
         return;
 
     float min_limit = -360.0f;