diff --git a/components/SelectWithSelect/index.scss b/components/ExtendedMasterySelect/index.scss
similarity index 100%
rename from components/SelectWithSelect/index.scss
rename to components/ExtendedMasterySelect/index.scss
diff --git a/components/SelectWithSelect/index.tsx b/components/ExtendedMasterySelect/index.tsx
similarity index 96%
rename from components/SelectWithSelect/index.tsx
rename to components/ExtendedMasterySelect/index.tsx
index ff3c2480..ff9cc218 100644
--- a/components/SelectWithSelect/index.tsx
+++ b/components/ExtendedMasterySelect/index.tsx
@@ -26,7 +26,7 @@ const defaultProps = {
   selectDisabled: false,
 }
 
-const SelectWithInput = ({
+const ExtendedMasterySelect = ({
   name,
   object,
   dataSet,
@@ -70,9 +70,6 @@ const SelectWithInput = ({
   function onClose() {
     setLeftSelectOpen(false)
     setRightSelectOpen(false)
-
-    setCurrentItemSkill(undefined)
-    setCurrentItemValue(0)
   }
 
   // Methods: Rendering
@@ -161,6 +158,6 @@ const SelectWithInput = ({
   )
 }
 
-SelectWithInput.defaultProps = defaultProps
+ExtendedMasterySelect.defaultProps = defaultProps
 
-export default SelectWithInput
+export default ExtendedMasterySelect
diff --git a/components/RingSelect/index.tsx b/components/RingSelect/index.tsx
index 2ccee7d4..bb303ac2 100644
--- a/components/RingSelect/index.tsx
+++ b/components/RingSelect/index.tsx
@@ -2,7 +2,7 @@
 import React, { useEffect, useState } from 'react'
 
 // UI dependencies
-import SelectWithSelect from '~components/SelectWithSelect'
+import ExtendedMasterySelect from '~components/ExtendedMasterySelect'
 
 // Data
 import { overMastery } from '~data/overMastery'
@@ -127,7 +127,7 @@ const RingSelect = ({ gridCharacter, sendValues }: Props) => {
         const ringIndex = i + 1
         const ringStat = rings[ringIndex]
         return (
-          <SelectWithSelect
+          <ExtendedMasterySelect
             name={`ring-${ringIndex}`}
             object="ring"
             key={`ring-${ringIndex}`}