diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index 0ddc217afd..2c3c97d992 100644
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -142,6 +142,12 @@ void InsetSpace::doDispatch(Cursor & cur, FuncRequest & cmd)
 }
 
 
+void InsetSpace::edit(Cursor & cur, bool, EntryDirection)
+{
+	InsetSpaceMailer(*this).showDialog(&cur.bv());
+}
+
+
 void InsetSpace::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	if (isStretchableSpace()) {
@@ -497,6 +503,12 @@ bool InsetSpace::isStretchableSpace() const
 }
 
 
+docstring InsetSpace::contextMenu(BufferView const &, int, int) const
+{
+	return from_ascii("context-space");
+}
+
+
 string const InsetSpaceMailer::name_ = "space";
 
 
diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h
index 321aae8bd7..e6f5bce986 100644
--- a/src/insets/InsetSpace.h
+++ b/src/insets/InsetSpace.h
@@ -106,6 +106,11 @@ public:
 	/// the string that is passed to the TOC
 	void textString(odocstream &) const;
 	///
+	void edit(Cursor & cur, bool front,
+		EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
+	///
+	EDITABLE editable() const { return IS_EDITABLE; }
+	///
 	InsetCode lyxCode() const { return SPACE_CODE; }
 	/// is this an expandible space (rubber length)?
 	bool isStretchableSpace() const;
@@ -117,6 +122,8 @@ public:
 	/// is this equivalent to a space (which is BTW different from
 	// a line separator)?
 	bool isSpace() const { return true; }
+	///
+	virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
 private:
 	virtual Inset * clone() const { return new InsetSpace(*this); }
 	///