diff --git a/labelme/app.py b/labelme/app.py
index 17a313b97..59ee2d238 100644
--- a/labelme/app.py
+++ b/labelme/app.py
@@ -1191,9 +1191,9 @@ def toggleDrawMode(self, edit=True, createMode="polygon"):
                 self.actions.createRectangleMode.setEnabled(True)
             else:
                 self.actions.createRectangleMode.setEnabled(
-                    self._classType is None or 'segmentation' in self._classType)
-                self.actions.createMode.setEnabled(
                     self._classType is None or 'detection' in self._classType)
+                self.actions.createMode.setEnabled(
+                    self._classType is None or 'segmentation' in self._classType)
             self.actions.createCircleMode.setEnabled(False)
             self.actions.createLineMode.setEnabled(False)
             self.actions.createPointMode.setEnabled(False)
@@ -1203,7 +1203,7 @@ def toggleDrawMode(self, edit=True, createMode="polygon"):
                 self.actions.createMode.setEnabled(True)
                 self.actions.createRectangleMode.setEnabled(True)
             else:
-                if createMode == "polygon":
+                if createMode == "rectangle":
                     self.actions.createMode.setEnabled(False)
                     self.actions.createRectangleMode.setEnabled(
                         self._classType is None or 'detection' in self._classType)
@@ -1211,7 +1211,7 @@ def toggleDrawMode(self, edit=True, createMode="polygon"):
                     self.actions.createLineMode.setEnabled(False)
                     self.actions.createPointMode.setEnabled(False)
                     self.actions.createLineStripMode.setEnabled(False)
-                elif createMode == "rectangle":
+                elif createMode == "polygon":
                     self.actions.createMode.setEnabled(
                         self._classType is None or 'segmentation' in self._classType
                     )
diff --git a/version.xml b/version.xml
index 473e3bcc5..d01cd1e28 100644
--- a/version.xml
+++ b/version.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <maintainer email="pyo@robotis.com">Pyo</maintainer>
   <maintainer email="osh@robotis.com">SungHyeon Oh</maintainer>
   <license>GPLv3</license>