1 files changed, 34 insertions, 8 deletions

diff --git a/js/components/layout/tools-properties.reel/tools-properties.js b/js/components/layout/tools-properties.reel/tools-properties.js
index 47945b58..c25559ae 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.js
+++ b/js/components/layout/tools-properties.reel/tools-properties.js
@@ -9,10 +9,43 @@ var Component = require("montage/ui/component").Component;
 
 exports.ToolsProperties = Montage.create(Component, {
 
-    disabled: {
+    _currentDocument: {
+        enumerable: false,
+        value: null
+    },
+
+    currentDocument: {
+        enumerable: false,
+        get: function() {
+            return this._currentDocument;
+        },
+        set: function(value) {
+            if (value === this._currentDocument) {
+                return;
+            }
+
+            this._currentDocument = value;
+
+            this.disabled = !this._currentDocument;
+
+        }
+    },
+
+    _disabled: {
         value: true
     },
 
+    disabled: {
+        get: function() {
+            return this._disabled;
+        },
+        set: function(value) {
+            if(value !== this._disabled) {
+                this._disabled = value;
+            }
+        }
+    },
+
     handleCloseDocument: {
         value: function(){
             if(!this.application.ninja.documentController.activeDocument) {
@@ -21,16 +54,9 @@ exports.ToolsProperties = Montage.create(Component, {
         }
     },
 
-    handleOpenDocument: {
-        value: function() {
-            this.disabled = false;
-        }
-    },
-
     prepareForDraw: {
         enumerable: false,
         value: function() {
-            this.eventManager.addEventListener( "openDocument", this, false);
             this.eventManager.addEventListener( "closeDocument", this, false);
         }
     },