diff --git a/core/modules/widgets/button.js b/core/modules/widgets/button.js
index 49386b8b5..da4ba5a01 100644
--- a/core/modules/widgets/button.js
+++ b/core/modules/widgets/button.js
@@ -110,7 +110,7 @@ ButtonWidget.prototype.getBoundingClientRect = function() {
 };
 
 ButtonWidget.prototype.isSelected = function() {
-        return this.wiki.getTextReference(this.set,"",this.getVariable("currentTiddler")) === this.setTo;
+    return this.wiki.getTextReference(this.set,this.defaultSetValue,this.getVariable("currentTiddler")) === this.setTo;
 };
 
 ButtonWidget.prototype.isPoppedUp = function() {
@@ -165,7 +165,7 @@ ButtonWidget.prototype.execute = function() {
 	this.tooltip = this.getAttribute("tooltip");
 	this.style = this.getAttribute("style");
 	this.selectedClass = this.getAttribute("selectedClass");
-	this.defaultSetValue = this.getAttribute("default");
+	this.defaultSetValue = this.getAttribute("default","");
 	this.buttonTag = this.getAttribute("tag");
 	// Make child widgets
 	this.makeChildWidgets();