diff --git a/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/cloud.h b/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/cloud.h
index f1a2ce1b01a..654cd3a7077 100644
--- a/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/cloud.h
+++ b/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/cloud.h
@@ -49,6 +49,10 @@
 # include <OpenGL/gl.h>
 # include <OpenGL/glu.h>
 #else
+#if _WIN32
+// Need this to pull in APIENTRY, etc.
+#include "windows.h"
+#endif
 # include <GL/gl.h>
 # include <GL/glu.h>
 #endif
diff --git a/apps/point_cloud_editor/src/cloudEditorWidget.cpp b/apps/point_cloud_editor/src/cloudEditorWidget.cpp
index c6a90a7e704..505888dc55f 100644
--- a/apps/point_cloud_editor/src/cloudEditorWidget.cpp
+++ b/apps/point_cloud_editor/src/cloudEditorWidget.cpp
@@ -306,6 +306,11 @@ CloudEditorWidget::denoise ()
     return;
   DenoiseParameterForm form;
   form.exec();
+  // check for cancel.
+  if (!form.ok())
+  {
+	  return;
+  }
   boost::shared_ptr<DenoiseCommand> c(new DenoiseCommand(selection_ptr_,
     cloud_ptr_, form.getMeanK(), form.getStdDevThresh()));
   command_queue_ptr_->execute(c);