diff --git a/extensions/workspace-indicator/extension.js b/extensions/workspace-indicator/extension.js
index 3236eca5..ef0f5b78 100644
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -37,6 +37,7 @@ WorkspaceIndicator.prototype = {
 
 		//styling
 		this.menu.actor.add_style_class_name('workspace-indicator-shorter');
+		this.statusLabel.add_style_class_name('panel-workspace-indicator');
 	},
 
 	_updateIndicator: function() {
@@ -50,6 +51,7 @@ WorkspaceIndicator.prototype = {
 	_labelText : function(workspaceIndex) {
 	    if(workspaceIndex == undefined) {
 		workspaceIndex = this._currentWorkspace;
+		return (workspaceIndex + 1).toString();
 	    }
 	    return Meta.prefs_get_workspace_name(workspaceIndex);
 	},
diff --git a/extensions/workspace-indicator/stylesheet.css b/extensions/workspace-indicator/stylesheet.css
index 47ee5351..e73eedcc 100644
--- a/extensions/workspace-indicator/stylesheet.css
+++ b/extensions/workspace-indicator/stylesheet.css
@@ -2,3 +2,8 @@
 	min-width: 25px;
 	font-size: 10pt;
 }
+.panel-workspace-indicator {
+	padding: 0 8px;
+	background-color: rgba(200, 200, 200, .5);
+	border: 1px solid #cccccc;
+}