diff --git a/src/tags/helpers/EditTagModal.js b/src/tags/helpers/EditTagModal.js
index ea6f7bc4..a9cbdb1b 100644
--- a/src/tags/helpers/EditTagModal.js
+++ b/src/tags/helpers/EditTagModal.js
@@ -1,109 +1,62 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { Modal, ModalBody, ModalFooter, ModalHeader, Popover } from 'reactstrap';
 import { ChromePicker } from 'react-color';
 import { faPalette as colorIcon } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import PropTypes from 'prop-types';
 import './EditTagModal.scss';
+import { useToggle } from '../../utils/helpers/hooks';
 
-const EditTagModal = ({ getColorForKey }) => class EditTagModal extends React.Component {
-  static propTypes = {
-    tag: PropTypes.string,
-    editTag: PropTypes.func,
-    toggle: PropTypes.func,
-    tagEdited: PropTypes.func,
-    isOpen: PropTypes.bool,
-    tagEdit: PropTypes.shape({
-      error: PropTypes.bool,
-      editing: PropTypes.bool,
-    }),
-  };
+const propTypes = {
+  tag: PropTypes.string,
+  editTag: PropTypes.func,
+  toggle: PropTypes.func,
+  tagEdited: PropTypes.func,
+  isOpen: PropTypes.bool,
+  tagEdit: PropTypes.shape({
+    error: PropTypes.bool,
+    editing: PropTypes.bool,
+  }),
+};
 
-  saveTag = (e) => {
-    e.preventDefault();
-    const { tag: oldName, editTag, toggle } = this.props;
-    const { tag: newName, color } = this.state;
+const EditTagModal = ({ getColorForKey }) => {
+  const EditTagModalComp = ({ tag, editTag, toggle, tagEdited, isOpen, tagEdit }) => {
+    const [ newTagName, setNewTagName ] = useState(tag);
+    const [ color, setColor ] = useState(getColorForKey(tag));
+    const [ showColorPicker, toggleColorPicker ] = useToggle();
+    const saveTag = (e) => {
+      e.preventDefault();
 
-    editTag(oldName, newName, color)
-      .then(() => {
-        this.tagWasEdited = true;
-        toggle();
-      })
-      .catch(() => {});
-  };
-  handleOnClosed = () => {
-    if (!this.tagWasEdited) {
-      return;
-    }
-
-    const { tag: oldName, tagEdited } = this.props;
-    const { tag: newName, color } = this.state;
-
-    tagEdited(oldName, newName, color);
-  };
-
-  constructor(props) {
-    super(props);
-
-    const { tag } = props;
-
-    this.state = {
-      showColorPicker: false,
-      tag,
-      color: getColorForKey(tag),
+      editTag(tag, newTagName, color)
+        .then(() => tagEdited(tag, newTagName, color))
+        .then(toggle)
+        .catch(() => {});
     };
-  }
-
-  componentDidMount() {
-    this.tagWasEdited = false;
-  }
-
-  render() {
-    const { isOpen, toggle, tagEdit } = this.props;
-    const { tag, color } = this.state;
-    const toggleColorPicker = () =>
-      this.setState(({ showColorPicker }) => ({ showColorPicker: !showColorPicker }));
 
     return (
-      <Modal isOpen={isOpen} toggle={toggle} centered onClosed={this.handleOnClosed}>
-        <form onSubmit={(e) => this.saveTag(e)}>
+      <Modal isOpen={isOpen} toggle={toggle} centered>
+        <form onSubmit={saveTag}>
           <ModalHeader toggle={toggle}>Edit tag</ModalHeader>
           <ModalBody>
             <div className="input-group">
-              <div
-                className="input-group-prepend"
-                id="colorPickerBtn"
-                onClick={toggleColorPicker}
-              >
+              <div className="input-group-prepend" id="colorPickerBtn" onClick={toggleColorPicker}>
                 <div
                   className="input-group-text edit-tag-modal__color-picker-toggle"
-                  style={{
-                    backgroundColor: color,
-                    borderColor: color,
-                  }}
+                  style={{ backgroundColor: color, borderColor: color }}
                 >
                   <FontAwesomeIcon icon={colorIcon} className="edit-tag-modal__color-icon" />
                 </div>
               </div>
-              <Popover
-                isOpen={this.state.showColorPicker}
-                toggle={toggleColorPicker}
-                target="colorPickerBtn"
-                placement="right"
-              >
-                <ChromePicker
-                  color={color}
-                  disableAlpha
-                  onChange={(color) => this.setState({ color: color.hex })}
-                />
+              <Popover isOpen={showColorPicker} toggle={toggleColorPicker} target="colorPickerBtn" placement="right">
+                <ChromePicker color={color} disableAlpha onChange={({ hex }) => setColor(hex)} />
               </Popover>
               <input
                 type="text"
-                value={tag}
+                value={newTagName}
                 placeholder="Tag"
                 required
                 className="form-control"
-                onChange={(e) => this.setState({ tag: e.target.value })}
+                onChange={(e) => setNewTagName(e.target.value)}
               />
             </div>
 
@@ -122,7 +75,11 @@ const EditTagModal = ({ getColorForKey }) => class EditTagModal extends React.Co
         </form>
       </Modal>
     );
-  }
+  };
+
+  EditTagModalComp.propTypes = propTypes;
+
+  return EditTagModalComp;
 };
 
 export default EditTagModal;
diff --git a/src/utils/services/provideServices.js b/src/utils/services/provideServices.js
index d4068614..5bc62442 100644
--- a/src/utils/services/provideServices.js
+++ b/src/utils/services/provideServices.js
@@ -1,5 +1,4 @@
 import axios from 'axios';
-import { stateFlagTimeout } from '../utils';
 import { useStateFlagTimeout } from '../helpers/hooks';
 import Storage from './Storage';
 import ColorGenerator from './ColorGenerator';
@@ -15,7 +14,6 @@ const provideServices = (bottle) => {
 
   bottle.constant('setTimeout', global.setTimeout);
   bottle.constant('clearTimeout', global.clearTimeout);
-  bottle.serviceFactory('stateFlagTimeout', stateFlagTimeout, 'setTimeout');
   bottle.serviceFactory('useStateFlagTimeout', useStateFlagTimeout, 'setTimeout', 'clearTimeout');
 };
 
diff --git a/src/utils/utils.js b/src/utils/utils.js
index db527df6..d8758be1 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -4,18 +4,6 @@ import marker from 'leaflet/dist/images/marker-icon.png';
 import markerShadow from 'leaflet/dist/images/marker-shadow.png';
 import { isEmpty, isNil, range } from 'ramda';
 
-const DEFAULT_TIMEOUT_DELAY = 2000;
-
-export const stateFlagTimeout = (setTimeout) => (
-  setState,
-  flagName,
-  initialValue = true,
-  delay = DEFAULT_TIMEOUT_DELAY
-) => {
-  setState({ [flagName]: initialValue });
-  setTimeout(() => setState({ [flagName]: !initialValue }), delay);
-};
-
 export const determineOrderDir = (clickedField, currentOrderField, currentOrderDir) => {
   if (currentOrderField !== clickedField) {
     return 'ASC';
diff --git a/test/utils/utils.test.js b/test/utils/utils.test.js
index 512053fe..66c92618 100644
--- a/test/utils/utils.test.js
+++ b/test/utils/utils.test.js
@@ -2,31 +2,9 @@ import L from 'leaflet';
 import marker2x from 'leaflet/dist/images/marker-icon-2x.png';
 import marker from 'leaflet/dist/images/marker-icon.png';
 import markerShadow from 'leaflet/dist/images/marker-shadow.png';
-import {
-  stateFlagTimeout as stateFlagTimeoutFactory,
-  determineOrderDir,
-  fixLeafletIcons,
-  rangeOf,
-} from '../../src/utils/utils';
+import { determineOrderDir, fixLeafletIcons, rangeOf } from '../../src/utils/utils';
 
 describe('utils', () => {
-  describe('stateFlagTimeout', () => {
-    it('sets state and initializes timeout with provided delay', () => {
-      const setTimeout = jest.fn((callback) => callback());
-      const setState = jest.fn();
-      const stateFlagTimeout = stateFlagTimeoutFactory(setTimeout);
-      const delay = 5000;
-
-      stateFlagTimeout(setState, 'foo', false, delay);
-
-      expect(setState).toHaveBeenCalledTimes(2);
-      expect(setState).toHaveBeenNthCalledWith(1, { foo: false });
-      expect(setState).toHaveBeenNthCalledWith(2, { foo: true });
-      expect(setTimeout).toHaveBeenCalledTimes(1);
-      expect(setTimeout).toHaveBeenCalledWith(expect.anything(), delay);
-    });
-  });
-
   describe('determineOrderDir', () => {
     it('returns ASC when current order field and selected field are different', () => {
       expect(determineOrderDir('foo', 'bar')).toEqual('ASC');