diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 561e175..d31a409 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -2031,9 +2031,9 @@
       "dev": true
     },
     "caniuse-db": {
-      "version": "1.0.30000671",
+      "version": "1.0.30000679",
       "from": "caniuse-db@>=1.0.30000634 <2.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000671.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000679.tgz",
       "dev": true
     },
     "caseless": {
@@ -2048,6 +2048,11 @@
       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
       "dev": true
     },
+    "chain-function": {
+      "version": "1.0.0",
+      "from": "chain-function@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/chain-function/-/chain-function-1.0.0.tgz"
+    },
     "chalk": {
       "version": "1.1.3",
       "from": "chalk@>=1.1.0 <2.0.0",
@@ -2471,18 +2476,10 @@
       "dev": true
     },
     "css-loader": {
-      "version": "0.28.2",
-      "from": "css-loader@0.28.2",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.2.tgz",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": {
-          "version": "0.1.8",
-          "from": "source-list-map@>=0.1.7 <0.2.0",
-          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
-          "dev": true
-        }
-      }
+      "version": "0.28.4",
+      "from": "css-loader@0.28.4",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.4.tgz",
+      "dev": true
     },
     "css-select": {
       "version": "1.2.0",
@@ -2725,6 +2722,11 @@
         }
       }
     },
+    "dom-helpers": {
+      "version": "3.2.1",
+      "from": "dom-helpers@>=3.2.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.2.1.tgz"
+    },
     "dom-serialize": {
       "version": "2.2.1",
       "from": "dom-serialize@>=2.2.0 <3.0.0",
@@ -2789,9 +2791,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.11",
+      "version": "1.3.13",
       "from": "electron-to-chromium@>=1.2.7 <2.0.0",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.11.tgz",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.13.tgz",
       "dev": true
     },
     "emojis-list": {
@@ -3345,11 +3347,13 @@
       "version": "0.8.6",
       "from": "fbjs@>=0.8.4 <0.9.0",
       "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.6.tgz",
+      "dev": true,
       "dependencies": {
         "core-js": {
           "version": "1.2.7",
           "from": "core-js@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz"
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+          "dev": true
         }
       }
     },
@@ -3366,18 +3370,10 @@
       "dev": true
     },
     "file-loader": {
-      "version": "0.11.1",
-      "from": "file-loader@0.11.1",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.1.tgz",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": {
-          "version": "1.1.0",
-          "from": "loader-utils@>=1.0.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
-          "dev": true
-        }
-      }
+      "version": "0.11.2",
+      "from": "file-loader@0.11.2",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz",
+      "dev": true
     },
     "filename-regex": {
       "version": "2.0.0",
@@ -3912,6 +3908,26 @@
       "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
       "dev": true
     },
+    "icss-utils": {
+      "version": "2.1.0",
+      "from": "icss-utils@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.1",
+          "from": "postcss@>=6.0.1 <7.0.0",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "from": "supports-color@^3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "dev": true
+        }
+      }
+    },
     "ieee754": {
       "version": "1.1.8",
       "from": "ieee754@>=1.1.4 <2.0.0",
@@ -4426,9 +4442,9 @@
       }
     },
     "karma-jsdom-launcher": {
-      "version": "6.1.1",
-      "from": "karma-jsdom-launcher@6.1.1",
-      "resolved": "https://registry.npmjs.org/karma-jsdom-launcher/-/karma-jsdom-launcher-6.1.1.tgz",
+      "version": "6.1.2",
+      "from": "karma-jsdom-launcher@6.1.2",
+      "resolved": "https://registry.npmjs.org/karma-jsdom-launcher/-/karma-jsdom-launcher-6.1.2.tgz",
       "dev": true
     },
     "karma-mocha": {
@@ -6027,11 +6043,6 @@
         }
       }
     },
-    "react-addons-css-transition-group": {
-      "version": "15.5.2",
-      "from": "react-addons-css-transition-group@15.5.2",
-      "resolved": "https://registry.npmjs.org/react-addons-css-transition-group/-/react-addons-css-transition-group-15.5.2.tgz"
-    },
     "react-addons-perf": {
       "version": "15.4.2",
       "from": "react-addons-perf@15.4.2",
@@ -6256,6 +6267,11 @@
       "resolved": "https://registry.npmjs.org/react-transform-hmr/-/react-transform-hmr-1.0.4.tgz",
       "dev": true
     },
+    "react-transition-group": {
+      "version": "1.1.3",
+      "from": "react-transition-group@latest",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-1.1.3.tgz"
+    },
     "read": {
       "version": "1.0.7",
       "from": "read@>=1.0.0 <1.1.0",
@@ -6734,9 +6750,9 @@
       "dev": true,
       "dependencies": {
         "ajv": {
-          "version": "5.1.3",
+          "version": "5.1.5",
           "from": "ajv@>=5.0.0 <6.0.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.1.5.tgz",
           "dev": true
         }
       }
@@ -6884,9 +6900,9 @@
       "dev": true
     },
     "sinon": {
-      "version": "2.3.1",
-      "from": "sinon@2.3.1",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-2.3.1.tgz",
+      "version": "2.3.2",
+      "from": "sinon@2.3.2",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-2.3.2.tgz",
       "dev": true
     },
     "slash": {
@@ -7192,9 +7208,9 @@
       "dev": true
     },
     "style-loader": {
-      "version": "0.18.1",
-      "from": "style-loader@0.18.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.18.1.tgz",
+      "version": "0.18.2",
+      "from": "style-loader@0.18.2",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.18.2.tgz",
       "dev": true
     },
     "supports-color": {
@@ -7618,9 +7634,9 @@
       }
     },
     "url-search-params-polyfill": {
-      "version": "1.2.0",
-      "from": "url-search-params-polyfill@latest",
-      "resolved": "https://registry.npmjs.org/url-search-params-polyfill/-/url-search-params-polyfill-1.2.0.tgz"
+      "version": "1.3.0",
+      "from": "url-search-params-polyfill@1.3.0",
+      "resolved": "https://registry.npmjs.org/url-search-params-polyfill/-/url-search-params-polyfill-1.3.0.tgz"
     },
     "user-home": {
       "version": "1.1.1",
@@ -7785,9 +7801,9 @@
       }
     },
     "webfontloader": {
-      "version": "1.6.27",
-      "from": "webfontloader@1.6.27",
-      "resolved": "https://registry.npmjs.org/webfontloader/-/webfontloader-1.6.27.tgz"
+      "version": "1.6.28",
+      "from": "webfontloader@1.6.28",
+      "resolved": "https://registry.npmjs.org/webfontloader/-/webfontloader-1.6.28.tgz"
     },
     "webfonts-generator": {
       "version": "0.3.5",
diff --git a/package.json b/package.json
index 1402aac..ae94268 100644
--- a/package.json
+++ b/package.json
@@ -32,13 +32,13 @@
     "promise.prototype.finally": "^2.0.0",
     "raven-js": "^3.8.1",
     "react": "^15.0.0",
-    "react-addons-css-transition-group": "^15.1.0",
     "react-dom": "^15.0.0",
     "react-helmet": "^5.0.0",
     "react-intl": "^2.0.0",
     "react-motion": "^0.5.0",
     "react-redux": "^5.0.0",
     "react-router-dom": "^4.1.1",
+    "react-transition-group": "^1.1.3",
     "redux": "^3.0.4",
     "redux-localstorage": "^0.4.1",
     "redux-thunk": "^2.0.0",
diff --git a/src/components/ui/popup/PopupStack.jsx b/src/components/ui/popup/PopupStack.jsx
index 0292f00..88a5161 100644
--- a/src/components/ui/popup/PopupStack.jsx
+++ b/src/components/ui/popup/PopupStack.jsx
@@ -1,6 +1,6 @@
 import React, { Component, PropTypes } from 'react';
 
-import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
+import { CSSTransitionGroup } from 'react-transition-group';
 import { browserHistory } from 'services/history';
 
 import styles from './popup.scss';
@@ -30,7 +30,7 @@ export class PopupStack extends Component {
         const {popups} = this.props;
 
         return (
-            <ReactCSSTransitionGroup
+            <CSSTransitionGroup
                 transitionName={{
                     enter: styles.trEnter,
                     enterActive: styles.trEnterActive,
@@ -51,7 +51,7 @@ export class PopupStack extends Component {
                         </div>
                     );
                 })}
-            </ReactCSSTransitionGroup>
+            </CSSTransitionGroup>
         );
     }