diff --git a/src/server/gwt/.classpath b/src/server/gwt/.classpath
index 75a628f90..2a4886461 100644
--- a/src/server/gwt/.classpath
+++ b/src/server/gwt/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/Users/bringert/src/gwt-mac-1.5.3/gwt-user.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="src"/>
 </classpath>
diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/CompletionOracle.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/CompletionOracle.java
index fbeceb483..743f6238b 100644
--- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/CompletionOracle.java
+++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/CompletionOracle.java
@@ -60,6 +60,9 @@ public class CompletionOracle extends SuggestOracle {
 		// only allow a single completion request at a time
 		if (JSONRequest != null)
 			JSONRequest.cancel();
+		
+		// hack: first report no completions, to hide suggestions until we get the new completions
+		callback.onSuggestionsReady(request, new SuggestOracle.Response(new ArrayList<CompletionSuggestion>()));
 
 		JSONRequest = pgf.complete(request.getQuery(), getInputLangs(), null, request.getLimit(), 
 				new PGF.CompleteCallback() {