diff --git a/src/popup/app/services/stateService.js b/src/popup/app/services/stateService.js
new file mode 100644
index 0000000000..2ab144dcdd
--- /dev/null
+++ b/src/popup/app/services/stateService.js
@@ -0,0 +1,21 @@
+angular
+    .module('bit.services')
+
+    .factory('stateService', function () {
+        var _service = {},
+            _state = {};
+
+        _service.saveState = function (key, data) {
+            _state[key] = data;
+        };
+
+        _service.getState = function (key) {
+            if (key in _state) {
+                return _state[key];
+            }
+
+            return null;
+        };
+
+        return _service;
+    });
diff --git a/src/popup/index.html b/src/popup/index.html
index 6378dc49aa..a5ca41e554 100644
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -43,6 +43,7 @@
     <script src="app/services/backgroundService.js"></script>
     <script src="app/services/loginService.js"></script>
     <script src="app/services/validationService.js"></script>
+    <script src="app/services/stateService.js"></script>
 
     <script src="app/global/globalModule.js"></script>
     <script src="app/global/mainController.js"></script>