diff --git a/packages/Algernon.package/.squot-contents b/packages/Algernon.package/.squot-contents
deleted file mode 100644
index 666ec7f8..00000000
--- a/packages/Algernon.package/.squot-contents
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	#objectClassName : #PackageInfo,
-	#serializer : #SquotCypressCodeSerializer
-}
\ No newline at end of file
diff --git a/packages/Algernon.package/ALGCore.class/class/activationString.st b/packages/Algernon.package/ALGCore.class/class/activationString.st
index bab5c179..b0f23148 100644
--- a/packages/Algernon.package/ALGCore.class/class/activationString.st
+++ b/packages/Algernon.package/ALGCore.class/class/activationString.st
@@ -1,6 +1,6 @@
 accessing
 activationString
 
-	ActivationString ifNil:  [ALGCore activationString: '<Cmd- >' ].
-	 ActivationString ifEmpty: [ALGCore activationString: '<Cmd- >'].
+	ActivationString ifNil:  [ALGCore activationString: '<Cmd-space>' ].
+	 ActivationString ifEmpty: [ALGCore activationString: '<Cmd-space>'].
 	^ActivationString 
\ No newline at end of file
diff --git a/packages/Algernon.package/ALGCore.class/instance/handleListenEvent..st b/packages/Algernon.package/ALGCore.class/instance/handleListenEvent..st
index b8022a44..bf491d53 100644
--- a/packages/Algernon.package/ALGCore.class/instance/handleListenEvent..st
+++ b/packages/Algernon.package/ALGCore.class/instance/handleListenEvent..st
@@ -3,6 +3,6 @@ handleListenEvent: anEvent
 
 	| isActivationString shouldToggle |
 	isActivationString := (anEvent keyString = self class activationString).
-	shouldToggle := (anEvent isKeystroke and: [isActivationString] and: [self receivedActivation not]).
+	shouldToggle := (isActivationString and: [self receivedActivation not]).
 	shouldToggle ifTrue: [self toggleVisibility: anEvent. self receivedActivation: true].
 	(self receivedActivation and: [anEvent isKeyUp]) ifTrue: [self receivedActivation: false]
\ No newline at end of file
diff --git a/packages/Algernon.package/ALGCore.class/instance/initializeProperties.st b/packages/Algernon.package/ALGCore.class/instance/initializeProperties.st
index 1d93f8ef..35ab3bbe 100644
--- a/packages/Algernon.package/ALGCore.class/instance/initializeProperties.st
+++ b/packages/Algernon.package/ALGCore.class/instance/initializeProperties.st
@@ -2,6 +2,7 @@ initialization
 initializeProperties
 
 	self
+		firstStep: true;
 		active: false;
 		wasChanged: false;
 		receivedActivation: false
\ No newline at end of file
diff --git a/packages/Algernon.package/ALGCore.class/methodProperties.json b/packages/Algernon.package/ALGCore.class/methodProperties.json
index c70f11c5..9046bb38 100644
--- a/packages/Algernon.package/ALGCore.class/methodProperties.json
+++ b/packages/Algernon.package/ALGCore.class/methodProperties.json
@@ -2,7 +2,7 @@
 	"class" : {
 		"activateAlgernon" : "AKK 5/18/2016 18:20",
 		"activateAlgernon:" : "mt 10/20/2015 14:23:33",
-		"activationString" : "AKK 5/11/2016 18:21",
+		"activationString" : "TD 4/27/2018 15:48",
 		"activationString:" : "AKK 5/11/2016 17:43",
 		"cleanup" : "mt 10/20/2015 14:26:27",
 		"close" : "J.J. 7/30/2015 21:53",
@@ -42,7 +42,7 @@
 		"filteringThreshold" : "DS 5/21/2017 16:54",
 		"firstStep:" : "DS 5/21/2017 16:43",
 		"grabFocus:" : "DS 5/14/2017 19:44",
-		"handleListenEvent:" : "DS 5/12/2017 22:59",
+		"handleListenEvent:" : "TD 4/27/2018 15:48",
 		"handleTextEntered:" : "DS 5/21/2017 16:55",
 		"handlesKeyboard:" : "DS 5/12/2017 22:57",
 		"handlesMouseDown:" : "J.J. 7/27/2015 19:41",
@@ -58,7 +58,7 @@
 		"initializeItems" : "PL 6/30/2016 12:06",
 		"initializeMorphs" : "fw 7/30/2015 22:13",
 		"initializePosition" : "J.J. 7/27/2015 19:38",
-		"initializeProperties" : "td 6/8/2016 21:12",
+		"initializeProperties" : "TD 4/27/2018 15:22",
 		"initializeProvider" : "J.J. 7/30/2015 22:00",
 		"initializeStacks" : "PL 6/30/2016 12:26",
 		"initializeWindow" : "td 6/8/2016 21:12",
diff --git a/packages/Algernon.package/monticello.meta/package b/packages/Algernon.package/monticello.meta/package
new file mode 100644
index 00000000..8a3f61f8
--- /dev/null
+++ b/packages/Algernon.package/monticello.meta/package
@@ -0,0 +1 @@
+(name 'Algernon')
\ No newline at end of file
diff --git a/packages/Algernon.package/monticello.meta/version b/packages/Algernon.package/monticello.meta/version
new file mode 100644
index 00000000..b5712a8c
--- /dev/null
+++ b/packages/Algernon.package/monticello.meta/version
@@ -0,0 +1 @@
+(name 'Algernon-TD.2' message 'Fix event handling' id '529c324e-644c-9a46-b8ba-666264b85d91' date '27 April 2018' time '3:49:11.664465 pm' author 'TD' ancestors ((name 'Algernon-cypress.1' message 'fabricated from a Cypress format repository' id '25eb11c9-fb4e-334a-8920-e2a8b5e5be63' date '27 April 2018' time '3:13:24.858692 pm' author '' ancestors () stepChildren ())) stepChildren ())
\ No newline at end of file