diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index c7ad9c857..8404f377c 100644
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -9,6 +9,8 @@
 import threading
 import math
 import platform
+import zipfile
+import tempfile
 
 import OpenGL
 OpenGL.ERROR_CHECKING = False
@@ -171,7 +173,15 @@ def loadFiles(self, filenames):
 			# pop first entry for processing and append new files at end
 			while filenames:
 				filename = filenames.pop(0)
-				if os.path.isdir(filename):
+				if filename.endswith('.zip'):
+					# Unpack zip, load all contained files.
+					destdir = tempfile.mkdtemp()
+					with zipfile.ZipFile(filename) as zipper:
+						zipper.extractall(destdir)
+					self.loadFiles([destdir])
+					# TODO: Cleanup (needs to be done safely)
+					continue
+				elif os.path.isdir(filename):
 					# directory: queue all included files and directories
 					filenames.extend(os.path.join(filename, f) for f in os.listdir(filename))
 				else:
@@ -201,7 +211,7 @@ def loadFiles(self, filenames):
 	def showLoadModel(self, button = 1):
 		if button == 1:
 			dlg=wx.FileDialog(self, _("Open 3D model"), os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST|wx.FD_MULTIPLE)
-			dlg.SetWildcard(meshLoader.loadWildcardFilter() + imageToMesh.wildcardList() + "|GCode file (*.gcode)|*.g;*.gcode;*.G;*.GCODE")
+			dlg.SetWildcard(meshLoader.loadWildcardFilter() + imageToMesh.wildcardList() + "|GCode file (*.gcode)|*.g;*.gcode;*.G;*.GCODE|Zip file (*.zip)|*.zip")
 			if dlg.ShowModal() != wx.ID_OK:
 				dlg.Destroy()
 				return