diff --git a/third_party/operatophone/config.xml b/third_party/operatophone/config.xml
index 0d40c0f..7a88100 100644
--- a/third_party/operatophone/config.xml
+++ b/third_party/operatophone/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget xmlns="http://www.w3.org/ns/widgets" id="https://addons.opera.com/addons/extensions/details/opera-to-phone/" version="1.3.3">
+<widget xmlns="http://www.w3.org/ns/widgets" id="https://addons.opera.com/addons/extensions/details/opera-to-phone/" version="1.3.4">
   <name>Opera to Phone</name>
   <access origin="https://chrometophone.appspot.com"/>
   <icon src="icon_64x64.png"/>
diff --git a/third_party/operatophone/index.html b/third_party/operatophone/index.html
index f246724..ce72758 100644
--- a/third_party/operatophone/index.html
+++ b/third_party/operatophone/index.html
@@ -5,7 +5,7 @@
 <script type="text/javascript" src="send_logic.js"></script>
 <script>
 var UIItemProperties = { // options for the button
-   disabled: false,
+   disabled: true,
    title: "Opera to Phone",
    icon: "icon_18x18.png",
    popup: {
@@ -74,6 +74,28 @@ function onMessage( message ) {
 }
 
 opera.extension.addEventListener( 'message' , onMessage, false );
+
+function enableButton() {
+	var tab = opera.extension.tabs.getFocused();
+	if (tab) {
+		operaBtn.disabled = false;
+	}
+	else {
+		operaBtn.disabled = true;
+	}
+}
+
+//Enable the button when a tab is ready.
+opera.extension.addEventListener( 'connect', function() {
+	enableButton();
+}, false );
+opera.extension.tabs.addEventListener( 'focus', function() {
+	enableButton();
+}, false );
+opera.extension.tabs.addEventListener( 'blur', function() {
+	enableButton();
+}, false );
+
 </script>
 </head>
 <body>
